Merge tag 'OTP-21.2' into sverker/map-from-ks-vs-bug

37 files changed, 1378 insertions, 827 deletions

diff --git a/lib/snmp/doc/src/Makefile b/lib/snmp/doc/src/Makefile
index 9ea5dba0c5..e7ab491eef 100644
--- a/lib/snmp/doc/src/Makefile
+++ b/lib/snmp/doc/src/Makefile
@@ -1,9 +1,9 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
 # %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.
 # You may obtain a copy of the License at
@@ -15,7 +15,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# 
+#
 # %CopyrightEnd%
 
 include $(ERL_TOP)/make/target.mk
@@ -66,7 +66,6 @@ HTML_REF6_FILES = $(XML_REF6_FILES:%.xml=$(HTMLDIR)/%.html)
 HTML_CHAP_FILES = $(XML_CHAPTER_FILES:%.xml=$(HTMLDIR)/%.html)
 
 EXTRA_FILES = \
-        summary.html.src \
         $(DEFAULT_HTML_FILES)  \
         $(HTML_REF1_FILES)     \
         $(HTML_REF3_FILES)     \
@@ -85,18 +84,14 @@ HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
-INDEX_FILE   = index.html
-INDEX_SRC    = $(INDEX_FILE).src
-INDEX_TARGET = $(DOCDIR)/$(INDEX_FILE)
-
 GIF_TARGETS = $(GIF_FILES:%=$(HTMLDIR)/%)
 
 
 # ----------------------------------------------------
-# FLAGS 
+# FLAGS
 # ----------------------------------------------------
-XML_FLAGS += 
-DVIPS_FLAGS += 
+XML_FLAGS +=
+DVIPS_FLAGS +=
 
 # ----------------------------------------------------
 # Targets
@@ -106,21 +101,17 @@ $(HTMLDIR)/%.gif: %.gif			# Copy them to ../html
 
 docs: pdf html man
 
-ldocs: local_docs $(INDEX_TARGET)
+ldocs: local_docs
 
 $(TOP_PDF_FILE): $(XML_FILES)
 
 pdf: $(TOP_PDF_FILE)
 
 html: gifs $(HTML_REF_MAN_FILE)
-html2: html $(INDEX_TARGET)
 
 clean clean_docs: clean_html clean_man clean_pdf
 	rm -f errs core *~
 
-$(INDEX_TARGET): $(INDEX_SRC) ../../vsn.mk	# Create top make file 
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@	# inserting version number
-
 man: man1 man3 man6 man7
 
 man1: $(MAN1_FILES)
@@ -133,7 +124,7 @@ man7: $(MAN7_FILES)
 
 gifs: $(GIF_TARGETS)
 
-debug opt: 
+debug opt:
 
 clean_pdf:
 	@echo "cleaning pdf:"
@@ -149,7 +140,7 @@ clean_man:
 clean_html:
 	@echo "cleaning html:"
 	rm -rf $(HTMLDIR)/*
-	rm -f $(INDEX_TARGET)
+	rm -rf $(XMLDIR)
 
 $(MAN7DIR)/%.7: $(MIBSDIR)/%.mib
 	@echo "processing $*"
@@ -162,7 +153,7 @@ $(MAN7DIR)/%.7: $(MIBSDIR)/%.mib
 
 # ----------------------------------------------------
 # Release Target
-# ---------------------------------------------------- 
+# ----------------------------------------------------
 
 $(MAN1DIR)/snmpc.1: snmpc_cmd.xml
 	date=`date +"%B %e %Y"`; \
@@ -194,7 +185,7 @@ info: info_xml info_man info_html
 	@echo "MAN6DIR: $(MAN6DIR)"
 	@echo "MAN7DIR: $(MAN7DIR)"
 
-info_man: 
+info_man:
 	@echo "man files:"
 	@echo "MAN1_FILES = $(MAN1_FILES)"
 	@echo "MAN3_FILES = $(MAN3_FILES)"
@@ -203,7 +194,7 @@ info_man:
 	@echo ""
 	@echo "MIB_FILES  = $(MIB_FILES)"
 
-info_xml: 
+info_xml:
 	@echo "xml files:"
 #	@echo "XML_REF1_FILES        = $(XML_REF1_FILES)"
 	@echo "XML_REF3_FILES        = $(XML_REF3_FILES)"
@@ -221,9 +212,7 @@ info_xml:
 info_html:
 	@echo "html files:"
 	@echo "DOCDIR = $(DOCDIR)"
-	@echo "INDEX_FILE = $(INDEX_FILE)"
-	@echo "INDEX_SRC = $(INDEX_SRC)"
-	@echo "INDEX_TARGET = $(INDEX_TARGET)"
+	@echo "HTML_REF_MAN_FILE = $(HTML_REF_MAN_FILE)"
 	@echo ""
 	@echo "HTMLDIR = $(HTMLDIR)"
 	@echo "HTML_APP_FILES  = $(HTML_APP_FILES)"
diff --git a/lib/snmp/doc/src/book.gif b/lib/snmp/doc/src/book.gif
deleted file mode 100644
index 94b3868792..0000000000
--- a/lib/snmp/doc/src/book.gif
+++ /dev/null
diff --git a/lib/snmp/doc/src/fascicules.xml b/lib/snmp/doc/src/fascicules.xml
deleted file mode 100644
index 37feca543f..0000000000
--- a/lib/snmp/doc/src/fascicules.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE fascicules SYSTEM "fascicules.dtd">
-
-<fascicules>
-  <fascicule file="part" href="part_frame.html" entry="no">
-    User's Guide
-  </fascicule>
-  <fascicule file="ref_man" href="ref_man_frame.html" entry="yes">
-    Reference Manual
-  </fascicule>
-  <fascicule file="part_notes" href="part_notes_frame.html" entry="no">
-    Release Notes
-  </fascicule>
-  <fascicule file="" href="../../../../doc/print.html" entry="no">
-    Off-Print
-  </fascicule>
-</fascicules>
-
diff --git a/lib/snmp/doc/src/files.mk b/lib/snmp/doc/src/files.mk
index 5aeae19105..f364cb6fa5 100644
--- a/lib/snmp/doc/src/files.mk
+++ b/lib/snmp/doc/src/files.mk
@@ -1,9 +1,9 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
 # %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.
 # You may obtain a copy of the License at
@@ -15,7 +15,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# 
+#
 # %CopyrightEnd%
 
 XML_APPLICATION_FILES = \
@@ -81,9 +81,7 @@ XML_REF3_FILES = \
 XML_REF6_FILES = snmp_app.xml
 
 XML_PART_FILES =  \
-	part.xml \
-	part_notes.xml \
-	part_notes_history.xml
+	part.xml
 
 XML_CHAPTER_FILES = \
 	snmp_intro.xml \
@@ -115,23 +113,16 @@ XML_FILES = $(BOOK_FILES)        \
             $(XML_REF6_FILES)    \
             $(XML_APPLICATION_FILES)
 
-GIF_FILES = book.gif \
+GIF_FILES = \
 	getnext1.gif \
 	getnext2.gif \
 	getnext3.gif \
 	getnext4.gif \
 	snmp_agent_netif_1.gif \
 	snmp_manager_netif_1.gif \
-	min_head.gif \
-	note.gif \
-	notes.gif \
-	ref_man.gif \
 	snmp-um-1-image-1.gif \
 	snmp-um-1-image-2.gif \
 	snmp-um-1-image-3.gif \
-	snmp.gif \
-	user_guide.gif \
-	warning.gif \
 	MIB_mechanism.gif
 
 PS_FILES = getnext1.ps \
diff --git a/lib/snmp/doc/src/index.html.src b/lib/snmp/doc/src/index.html.src
deleted file mode 100644
index e1b6be4d1f..0000000000
--- a/lib/snmp/doc/src/index.html.src
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<!-- This file is obsolete -->
-<HTML>
-<!-- 
- ``Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT 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$
--->
-<HEAD>
-<TITLE>SNMP %VSN%</TITLE>
-</HEAD>
-
-<BODY BGCOLOR="#FFFFFF">
-
-<CENTER>
-<A HREF="http://www.erlang.se/"><IMG  ALT="Erlang/OTP" BORDER=0 SRC="html/min_head.gif"></A><BR>
-
-<FONT SIZE="-1">
-[<A HREF="../../../doc/index.html">Up</A> |
-<A HREF="http://www.erlang.se/">Erlang/OTP</A>]
-</FONT><BR>
-
-<P><FONT SIZE="+3">
-SNMP
-</FONT><BR>  
-Version %VSN%
-</CENTER>
-
-<P><TABLE>
-<TR>
-<TD>
-<IMG ALIGN=LEFT ALT="SNMP" SRC="html/snmp.gif">
-</TD>
-
-<TD>
-<P>A bilingual Simple Network Management Protocol application,
- featuring an Extensible Agent, a simple manager, a MIB compiler 
- and facilities for implementing SNMP MIBs etc.
-</TD>
-</TR>
-</TABLE>
-
-<P><CENTER>
-<TABLE CELLPADDING=15>
-<TR>
-<TD ALIGN=CENTER>
-<A HREF="html/users_guide.html"><IMG ALT="User's Guide" BORDER=0 SRC="html/user_guide.gif"></A><BR>
-<FONT SIZE="-1">
-<A HREF="html/users_guide.html">User's Guide</A>
-</FONT>
-</TD>
-
-<TD ALIGN=CENTER>
-<A HREF="html/index.html"><IMG ALT="Reference Manual" BORDER=0 SRC="html/ref_man.gif"></A><BR>
-<FONT SIZE="-1">
-<A HREF="html/index.html">Reference Manual</A>
-</FONT>
-</TD>
-
-<TD ALIGN=CENTER>
-<A HREF="html/release_notes.html"><IMG ALT="Release Notes" BORDER=0 SRC="html/notes.gif"></A><BR>
-<FONT SIZE="-1">
-<A HREF="html/release_notes.html">Release Notes</A>
-</FONT>
-</TD>
-
-<TD ALIGN=CENTER>
-<A HREF="pdf/snmp-%VSN%.pdf"><IMG ALT="Off-Print" BORDER=0 SRC="html/book.gif"></A><BR>
-<FONT SIZE="-1">
-<A HREF="pdf/snmp-%VSN%.pdf">Off-Print</A>
-</FONT>
-</TD>
-</TR>
-</TABLE>
-</CENTER>
-
-<P><CENTER>
-<HR>
-<FONT SIZE="-1">
-Copyright &copy; 1991-2001
-<A HREF="http://www.erlang.se/">Ericsson Utvecklings AB</A>
-</FONT>
-</CENTER>
-</BODY>
-</HTML>
diff --git a/lib/snmp/doc/src/min_head.gif b/lib/snmp/doc/src/min_head.gif
deleted file mode 100644
index 67948a6378..0000000000
--- a/lib/snmp/doc/src/min_head.gif
+++ /dev/null
diff --git a/lib/snmp/doc/src/note.gif b/lib/snmp/doc/src/note.gif
deleted file mode 100644
index 6fffe30419..0000000000
--- a/lib/snmp/doc/src/note.gif
+++ /dev/null
diff --git a/lib/snmp/doc/src/notes.gif b/lib/snmp/doc/src/notes.gif
deleted file mode 100644
index e000cca26a..0000000000
--- a/lib/snmp/doc/src/notes.gif
+++ /dev/null
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 3323d32878..423d90fef6 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -4,14 +4,14 @@
 <chapter>
   <header>
     <copyright>
-      <year>1996</year><year>2016</year>
+      <year>1996</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
@@ -19,7 +19,7 @@
       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
       See the License for the specific language governing permissions and
       limitations under the License.
-    
+
     </legalnotice>
 
     <title>SNMP Release Notes</title>
@@ -34,7 +34,163 @@
   </header>
 
 
-  <section><title>SNMP 5.2.4</title>
+  <section><title>SNMP 5.2.12</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Conversion of (agent) Audit Trail Log (ATL) failed due
+	    to invalid log entries.</p> <p>The conversion aborted
+	    completely midway because the ATL contained invalid
+	    entries. The conversion has been improved so that it now
+	    firstly handles encountered errors and write an
+	    informative message (into the converted stream) and
+	    secondly keeps count of the number of successful or
+	    failed entry conversions. See <seealso
+	    marker="snmpa#log_to_txt">log_to_txt</seealso> for more
+	    info. </p> <p>The reason the ATL contained invalid
+	    entries have also been fixed. The reason was that for
+	    some outgoing messages (not response):</p> <list
+	    type="bulleted"> <item> <p>encrypted (v3 messages)</p>
+	    <p>Was logged "as is" (encrypted) without the info to
+	    decrypt, making conversion impossible (which was the
+	    reason the log contained bad entries).</p> </item> <item>
+	    <p>un-encrypted</p> <p>Was not logged at all. </p>
+	    </item> </list>
+          <p>
+	    Own Id: OTP-15287 Aux Id: ERIERL-206 </p>
+        </item>
+        <item>
+          <p>
+	    [compiler] Spurious version message removed. The snmp mib
+	    compiler printed an spurious version message if the
+	    'version' option was provided.</p>
+          <p>
+	    Own Id: OTP-15290</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<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>
+        <item>
+	    <p> Removed all old unused files in the documentation.
+	    </p>
+          <p>
+	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SNMP 5.2.8</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The <c>recbuf</c> configuration option was not propagated
+	    correctly to the socket for the SNMP Manager.</p>
+          <p>
+	    Own Id: OTP-13372 Aux Id: ERIERL-73 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SNMP 5.2.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    A bug in the SNMP MIB compiler has been fixed. An
+	    AUGMENTS referring to a table defined later in the MIB
+	    did not work.</p>
+          <p>
+	    Own Id: OTP-13014 Aux Id: ERL-375 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SNMP 5.2.6</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Internal code change: Calls to <c>catch</c> followed
+	    by a call to <c>erlang:get_stacktrace/0</c> has been
+	    rewritten to use <c>try</c> instead of <c>catch</c> to
+	    make the code future-proof.</p>
+          <p>
+	    Own Id: OTP-14400</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SNMP 5.2.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The SNMP MIB compiler has been fixed to compile MIBS with
+	    refinements on user types such as in RFC 4669
+	    RADIUS-AUTH-SERVER-MIB.mib. Problem reported and
+	    researched by Kenneth Lakin and Daniel Goertzen.</p>
+          <p>
+	    See also: https://bugs.erlang.org/browse/ERL-325</p>
+          <p>
+	    Own Id: OTP-14145 Aux Id: ERL-325 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SNMP 5.2.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
@@ -183,8 +339,8 @@
       <list type="bulleted">
         <item>
           <p>[compiler] Refinement of type Opaque was not allowed. </p>
-          <p>MIB constructs such as '<c>SYNTAX Opaque (SIZE(0..65535))</c>' 
-	  was previously not allowed, 
+          <p>MIB constructs such as '<c>SYNTAX Opaque (SIZE(0..65535))</c>'
+	  was previously not allowed,
 	  see the standard <c>ALARM-MIB</c> for eaxmple. </p>
           <p>Own Id: OTP-12066</p>
           <p>Aux Id: Seq 12669</p>
@@ -201,8 +357,8 @@
 <!--
       <list type="bulleted">
         <item>
-          <p>[agent] 
-	  see <seealso marker="snmpa#load_mibs">load_mibs</seealso> and 
+          <p>[agent]
+	  see <seealso marker="snmpa#load_mibs">load_mibs</seealso> and
 	  <seealso marker="snmpa#unload_mibs">unload_mibs</seealso>. </p>
           <p>Own Id: OTP-11216</p>
         </item>
@@ -333,18 +489,18 @@
 <!--
       <list type="bulleted">
         <item>
-          <p>Wrong block cypher type used for AES ('aes_cbf128' 
-	  instead of 'aes_cfb128') when performing AES block 
-	  encrypt/decrypt which breaks SNMP usmAesCfb128Protocol 
+          <p>Wrong block cypher type used for AES ('aes_cbf128'
+	  instead of 'aes_cfb128') when performing AES block
+	  encrypt/decrypt which breaks SNMP usmAesCfb128Protocol
 	  in agent and manager. </p>
           <p>Own Id: OTP-11412</p>
         </item>
 
         <item>
-          <p>[manager] When performing the AES encryption, invalid values for 
+          <p>[manager] When performing the AES encryption, invalid values for
 	  the EngineBoots and EngineTime was used. </p>
-	  <p>The values of the local agent was used, which would have produced 
-	  "some" values if an agent was actually running. 
+	  <p>The values of the local agent was used, which would have produced
+	  "some" values if an agent was actually running.
 	  If not it would have caused a crash. </p>
 	  <p>Own Id: OTP-11413</p>
         </item>
@@ -388,16 +544,16 @@
       <list type="bulleted">
         <item>
           <p>[agent] Enable SNMP to create missing database directories. </p>
-	  <p>Add 
+	  <p>Add
 	  <seealso marker="snmp_app#db_init_error">
-	  {db_init_error, create_db_and_dir}</seealso> option to SNMP 
-	  <seealso marker="snmp_app#manager_opts_and_types">manager</seealso> 
+	  {db_init_error, create_db_and_dir}</seealso> option to SNMP
+	  <seealso marker="snmp_app#manager_opts_and_types">manager</seealso>
 	  and
-	  <seealso marker="snmp_app#agent_opts_and_types">agent</seealso>. 
+	  <seealso marker="snmp_app#agent_opts_and_types">agent</seealso>.
 	  This allows them to create any missing parent directories for
-	  <c>db_dir</c>, rather than treating any missing directories 
+	  <c>db_dir</c>, rather than treating any missing directories
 	  as a fatal error.
-	  The default for <c>db_init_error</c>, which is <c>terminate</c>, 
+	  The default for <c>db_init_error</c>, which is <c>terminate</c>,
 	  is unchanged. </p>
 	  <p>Steve Vinoski</p>
           <p>Own Id: OTP-11352</p>
@@ -407,7 +563,7 @@
           <p>[manager] Improved handling of unexpected return values from
 	  <seealso marker="snmpm_user">snmpm_user</seealso>
 	  callback functions. </p>
-	  <p>Violations of the documented API (crashes or invalid return 
+	  <p>Violations of the documented API (crashes or invalid return
 	  values) will now result in an error message. </p>
           <p>Own Id: OTP-11307</p>
         </item>
@@ -415,16 +571,16 @@
         <item>
           <p>Add (atl) log conversion block option. </p>
 	  <p>It is now possible to request that the Audit Trail Log should
-	  be blocked during conversion (<c>log_to_txt</c> or <c>log_to_io</c>). 
-	  This could be usefull when coverting an entire large log (when 
+	  be blocked during conversion (<c>log_to_txt</c> or <c>log_to_io</c>).
+	  This could be usefull when coverting an entire large log (when
 	  there is a chance it may otherwise wrap during conversion). </p>
-	  <p>See 
-	  agent 
+	  <p>See
+	  agent
 	  <seealso marker="snmpa#log_to_txt">log_to_txt</seealso> and
-	  <seealso marker="snmpa#log_to_io">log_to_io</seealso> and also 
-	  manager 
+	  <seealso marker="snmpa#log_to_io">log_to_io</seealso> and also
+	  manager
 	  <seealso marker="snmpm#log_to_txt">log_to_txt</seealso> and
-	  <seealso marker="snmpm#log_to_io">log_to_io</seealso> 
+	  <seealso marker="snmpm#log_to_io">log_to_io</seealso>
 	  for details. </p>
           <p>Own Id: OTP-11396</p>
           <p>Own Id: seq12433</p>
@@ -433,9 +589,9 @@
         <item>
           <p>When converting an Audit Trail Log to text, a corrupt
 	  log entry could cause the entire conversion to fail. </p>
-	  <p>Also, for a log with sequence numbers, failing to 
+	  <p>Also, for a log with sequence numbers, failing to
 	  decode a log entry would cause the conversion to fail
-	  (not because of the failed decode, but because of the 
+	  (not because of the failed decode, but because of the
 	  failure to write the error message). </p>
           <p>Own Id: OTP-111453</p>
           <p>Aux Id: Seq 12459</p>
@@ -453,18 +609,18 @@
 
       <list type="bulleted">
         <item>
-          <p>Wrong block cypher type used for AES ('aes_cbf128' 
-	  instead of 'aes_cfb128') when performing AES block 
-	  encrypt/decrypt which breaks SNMP usmAesCfb128Protocol 
+          <p>Wrong block cypher type used for AES ('aes_cbf128'
+	  instead of 'aes_cfb128') when performing AES block
+	  encrypt/decrypt which breaks SNMP usmAesCfb128Protocol
 	  in agent and manager. </p>
           <p>Own Id: OTP-11412</p>
         </item>
 
         <item>
-          <p>[manager] When performing the AES encryption, invalid values for 
+          <p>[manager] When performing the AES encryption, invalid values for
 	  the EngineBoots and EngineTime was used. </p>
-	  <p>The values of the local agent was used, which would have produced 
-	  "some" values if an agent was actually running. 
+	  <p>The values of the local agent was used, which would have produced
+	  "some" values if an agent was actually running.
 	  If not it would have caused a crash. </p>
 	  <p>Own Id: OTP-11413</p>
         </item>
@@ -506,14 +662,14 @@
 
       <list type="bulleted">
         <item>
-          <p>[agent] Improved documentation for the functions for 
-	  loading and unloading mibs, 
-	  see <seealso marker="snmpa#load_mibs">load_mibs</seealso> and 
-	  <seealso marker="snmpa#unload_mibs">unload_mibs</seealso> for 
+          <p>[agent] Improved documentation for the functions for
+	  loading and unloading mibs,
+	  see <seealso marker="snmpa#load_mibs">load_mibs</seealso> and
+	  <seealso marker="snmpa#unload_mibs">unload_mibs</seealso> for
 	  more info. </p>
-          <p>Also added new functions for loading and unloading a single mib, 
-	  see <seealso marker="snmpa#load_mib">load_mib</seealso> and 
-	  <seealso marker="snmpa#unload_mib">unload_mib</seealso> for 
+          <p>Also added new functions for loading and unloading a single mib,
+	  see <seealso marker="snmpa#load_mib">load_mib</seealso> and
+	  <seealso marker="snmpa#unload_mib">unload_mib</seealso> for
 	  more info. </p>
           <p>Own Id: OTP-11216</p>
         </item>
@@ -529,8 +685,8 @@
 <!--
       <list type="bulleted">
         <item>
-          <p>[agent] 
-	  see <seealso marker="snmpa#load_mibs">load_mibs</seealso> and 
+          <p>[agent]
+	  see <seealso marker="snmpa#load_mibs">load_mibs</seealso> and
 	  <seealso marker="snmpa#unload_mibs">unload_mibs</seealso>. </p>
           <p>Own Id: OTP-11216</p>
         </item>
@@ -556,7 +712,7 @@
       </list>
 -->
     </section>
-    
+
   </section> <!-- 4.24.2 -->
 
 
@@ -589,29 +745,29 @@
 
       <list type="bulleted">
         <item>
-          <p>[agent] Reading the value of the vacmViewTreeFamilyMask returns 
+          <p>[agent] Reading the value of the vacmViewTreeFamilyMask returns
 	  it in the wrong (internal bitlist) format. </p>
 	  <p>The vacmViewTreeFamilyMask is defined as a bit string in the MIB
-	  (OCTET STRING). Internally a bitlist (list of 1's and 0's, 
+	  (OCTET STRING). Internally a bitlist (list of 1's and 0's,
 	  see <seealso marker="snmp_agent_config_files#vacm">vacm config file</seealso>
-	  for more info) is used. 
+	  for more info) is used.
 	  However, the MIB implementation assumed the latter, effectively
 	  rendering all attempts to read/set masks via SNMP unsuccessful. </p>
-	  <p>Since the mask is used in hot paths (e.g. access permission checks 
-	  for each SNMP operation, the bitlist representation of the mask has 
-	  benefits (e.g. faster processing). Reading/writing the view mask 
-	  objects is less time-critical. Therefore, to fix the issue, convert 
-	  between the bitlist (internal) representation and bitstring 
+	  <p>Since the mask is used in hot paths (e.g. access permission checks
+	  for each SNMP operation, the bitlist representation of the mask has
+	  benefits (e.g. faster processing). Reading/writing the view mask
+	  objects is less time-critical. Therefore, to fix the issue, convert
+	  between the bitlist (internal) representation and bitstring
 	  (external) when the vacmViewTreeFamilyMask objects are accessed. </p>
-	  <p>Also, the check of the vacm config file was invalid with 
-	  regard to the mask value. It was assumed to be a proper oid, which 
+	  <p>Also, the check of the vacm config file was invalid with
+	  regard to the mask value. It was assumed to be a proper oid, which
 	  is not strictly the case (see bitlist above). </p>
           <p>Own Id: OTP-11177</p>
 	  <p>Stefan Zegenhagen</p>
         </item>
 
         <item>
-          <p>[agent] The counter increment function in the local-db was  
+          <p>[agent] The counter increment function in the local-db was
 	  incorrect. It did not handle counter wrap correctly. </p>
           <p>Own Id: OTP-11192</p>
         </item>
@@ -658,26 +814,26 @@
         </item>
 
         <item>
-          <p>[agent] Introduced a documented behaviour for the mib-server 
-	  <seealso marker="snmpa_mib_data">mib-data backend</seealso>. 
+          <p>[agent] Introduced a documented behaviour for the mib-server
+	  <seealso marker="snmpa_mib_data">mib-data backend</seealso>.
 	  At present only the default module (<c>snmpa_mib_data_tttn</c>) is
 	  provided. </p>
-	  <p>A config option for the (agent) 
-	  <seealso marker="snmp_config#agent_mib_server">mib-servers</seealso> 
-	  mib-data backend module has been added to the agent config options, 
+	  <p>A config option for the (agent)
+	  <seealso marker="snmp_config#agent_mib_server">mib-servers</seealso>
+	  mib-data backend module has been added to the agent config options,
 	  <seealso marker="snmp_config#agent_ms_data_module">data_module</seealso>. </p>
 	  <p>Own Id: OTP-11101</p>
         </item>
 
         <item>
-          <p>[agent] Introduced a documented behaviour for the 
-	  <seealso marker="snmpa_mib_storage">mib storage</seealso>. 
-	  At present there are three simple modules 
-	  (<c>snmpa_mib_storage_ets</c>, <c>snmpa_mib_storage_dets</c> and 
+          <p>[agent] Introduced a documented behaviour for the
+	  <seealso marker="snmpa_mib_storage">mib storage</seealso>.
+	  At present there are three simple modules
+	  (<c>snmpa_mib_storage_ets</c>, <c>snmpa_mib_storage_dets</c> and
 	  <c>snmpa_mib_storage_mnesia</c>) implementing this behaviour,
 	  provided with the app. </p>
-	  <p>A config option for the (agent) 
-	  <seealso marker="snmp_config#agent_mib_storage">mib storage</seealso> 
+	  <p>A config option for the (agent)
+	  <seealso marker="snmp_config#agent_mib_storage">mib storage</seealso>
 	  has been added to the agent config options. </p>
 	  <p>Own Id: OTP-11107</p>
         </item>
@@ -735,14 +891,14 @@
       <list type="bulleted">
         <item>
           <p>[agent] Errors in <c>vacmAccessTable</c> RowStatus handling.
-	  There are problems with the handling of vacmAccessTableStatus 
+	  There are problems with the handling of vacmAccessTableStatus
 	  that cause some SNMP test suites to report errors.
-	  Most notably, erroneous set operations frequently cause "genErr" 
-	  errors to be returned. These "genErr" errors are usually caused 
-	  by badmatch exceptions coming from 
-	  <c>{ok, Row} = snmpa_vacm:get_row(RowIndex)</c> 
+	  Most notably, erroneous set operations frequently cause "genErr"
+	  errors to be returned. These "genErr" errors are usually caused
+	  by badmatch exceptions coming from
+	  <c>{ok, Row} = snmpa_vacm:get_row(RowIndex)</c>
 	  if the row does not exist. </p>
-	  <p>The semantics of the RowStatus handling in that table has 
+	  <p>The semantics of the RowStatus handling in that table has
 	  been adjusted to be compliant with the RowStatus
 	  textual description of SNPMv2-TC MIB. </p>
 	  <p>Stefan Zegenhagen</p>
@@ -766,7 +922,7 @@
         </item>
 
         <item>
-          <p>[compiler] The MIB compiler could not handle a table index 
+          <p>[compiler] The MIB compiler could not handle a table index
 	  that was defined later in the MIB. </p>
           <p>Own Id: OTP-10808</p>
         </item>
@@ -799,7 +955,7 @@
     <title>SNMP Development Toolkit 4.23</title>
 <!--
     <p>Version 4.23 supports code replacement in runtime from/to
-    version 4.22.1, 
+    version 4.22.1,
     4.22, 4.21.7 4.21.6 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1 and 4.21. </p>
 -->
 
@@ -811,14 +967,14 @@
 
       <list type="bulleted">
         <item>
-          <p>[manager] Polish return values of snmpm_user_default according 
+          <p>[manager] Polish return values of snmpm_user_default according
 	  to snmpm_user doc.</p>
 	  <p>Luca Favatella</p>
 	  <p>Own Id: OTP-10671</p>
         </item>
 
         <item>
-          <p>[agent] Remove runtime warning in snmpa_agent because of 
+          <p>[agent] Remove runtime warning in snmpa_agent because of
 	  tuple fun usage. </p>
 	  <p>Luca Favatella</p>
 	  <p>Own Id: OTP-10672</p>
@@ -840,10 +996,10 @@
       <!--
       <list type="bulleted">
         <item>
-          <p>[agent] Simultaneous 
-          <seealso marker="snmpa#backup">snmpa:backup/1,2</seealso> 
+          <p>[agent] Simultaneous
+          <seealso marker="snmpa#backup">snmpa:backup/1,2</seealso>
           calls can interfere.
-          The master agent did not check if a backup was already in 
+          The master agent did not check if a backup was already in
           progress when a backup request was accepted. </p>
           <p>Own Id: OTP-9884</p>
           <p>Aux Id: Seq 11995</p>
@@ -876,7 +1032,7 @@
   <section>
     <title>SNMP Development Toolkit 4.22.1</title>
     <p>Version 4.22.1 supports code replacement in runtime from/to
-    version 4.22, 4.21.7 4.21.6 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1 and 
+    version 4.22, 4.21.7 4.21.6 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1 and
     4.21. </p>
 
     <section>
@@ -888,15 +1044,15 @@
       <list type="bulleted">
         <item>
           <p>[agent] Sematic fixes to SNMP-USER-BASED-SM-MIB.
-	  The semantics allow the <c>usmUserAuthKeyChange</c> and 
-	  <c>usmUserPrivKeyChange</c> objects to be written to in the 
-	  same set requests that also creates and clones the user. 
-	  This was not possible beforehand, causing test tools checking 
+	  The semantics allow the <c>usmUserAuthKeyChange</c> and
+	  <c>usmUserPrivKeyChange</c> objects to be written to in the
+	  same set requests that also creates and clones the user.
+	  This was not possible beforehand, causing test tools checking
 	  semantic SNMPv3 behaviour to fail on a lot of test cases. </p>
-	  <p>Furthermore, once the user has been cloned by writing to an 
-	  instance of <c>usmUserCloneFrom</c>, further set-operations to 
-	  the same object will not return an error, but be no-ops. 
-	  Especially, it must be avoided to copy security parameters 
+	  <p>Furthermore, once the user has been cloned by writing to an
+	  instance of <c>usmUserCloneFrom</c>, further set-operations to
+	  the same object will not return an error, but be no-ops.
+	  Especially, it must be avoided to copy security parameters
 	  again (possibly even from a different user). </p>
 	  <p>Stefan Zegenhagen</p>
 	  <p>Own Id: OTP-10166</p>
@@ -904,14 +1060,14 @@
 
         <item>
           <p>[agent] Errors in <c>vacmAccessTable</c> RowStatus handling.
-	  There are problems with the handling of vacmAccessTableStatus 
+	  There are problems with the handling of vacmAccessTableStatus
 	  that cause some SNMP test suites to report errors.
-	  Most notably, erroneous set operations frequently cause "genErr" 
-	  errors to be returned. These "genErr" errors are usually caused 
-	  by badmatch exceptions coming from 
-	  <c>{ok, Row} = snmpa_vacm:get_row(RowIndex)</c> 
+	  Most notably, erroneous set operations frequently cause "genErr"
+	  errors to be returned. These "genErr" errors are usually caused
+	  by badmatch exceptions coming from
+	  <c>{ok, Row} = snmpa_vacm:get_row(RowIndex)</c>
 	  if the row does not exist. </p>
-	  <p>The semantics of the RowStatus handling in that table has 
+	  <p>The semantics of the RowStatus handling in that table has
 	  been adjusted to be compliant with the RowStatus
 	  textual description of SNPMv2-TC MIB. </p>
 	  <p>Stefan Zegenhagen</p>
@@ -930,24 +1086,24 @@
       <list type="bulleted">
         <item>
           <p>[agent] Fix walk over vacmAccessTable.
-	  Fix the get_next implementation of vacmAccessTable to 
+	  Fix the get_next implementation of vacmAccessTable to
 	  return all table entries. </p>
-	  <p>The get_next implementation of vacmAccessTable did not return 
-	  all available table data. Instead, it only returned the first 
+	  <p>The get_next implementation of vacmAccessTable did not return
+	  all available table data. Instead, it only returned the first
 	  column for each row, and all columns for the last row available. </p>
 	  <p>Stefan Zegenhagen</p>
           <p>Own Id: OTP-10165</p>
         </item>
 
         <item>
-          <p>[manager] 
-	  <seealso marker="snmpm#log_to_io">snmpm:log_to_io/6</seealso> 
+          <p>[manager]
+	  <seealso marker="snmpm#log_to_io">snmpm:log_to_io/6</seealso>
 	  did not use the LogName argument. </p>
           <p>Own Id: OTP-10066</p>
         </item>
 
         <item>
-          <p>Incorrect TimeTicks decode. Also bad handling of 
+          <p>Incorrect TimeTicks decode. Also bad handling of
 	  invalid encode (value outside of value range) for both
 	  <c>TimeTicks</c> and <c>Unsigned32</c>. </p>
           <p>Own Id: OTP-10132</p>
@@ -978,38 +1134,38 @@
 
       <list type="bulleted">
         <item>
-          <p>[compiler] The table information the MIB compiler provides with 
-	  augmented tables has been extended with <c>nbr_of_cols</c>, 
+          <p>[compiler] The table information the MIB compiler provides with
+	  augmented tables has been extended with <c>nbr_of_cols</c>,
 	  <c>first_accessible</c> and <c>not_accessible</c>. </p>
           <p>Own Id: OTP-9969</p>
         </item>
 
         <item>
-          <p>Added the <c>log_to_io</c> audit-trail-log converter function 
-	  to the api modules of both the 
-	  <seealso marker="snmpm#log_to_io">manager</seealso> 
-	  and 
+          <p>Added the <c>log_to_io</c> audit-trail-log converter function
+	  to the api modules of both the
+	  <seealso marker="snmpm#log_to_io">manager</seealso>
+	  and
 	  <seealso marker="snmpa#log_to_io">agent</seealso>. </p>
           <p>Own Id: OTP-9940</p>
         </item>
 
         <item>
-          <p>[manager] Introduced a new transport module, 
-	  <c>snmpm_net_if_mt</c>, 
-	  which handles all incomming and outgoing 
+          <p>[manager] Introduced a new transport module,
+	  <c>snmpm_net_if_mt</c>,
+	  which handles all incomming and outgoing
 	  traffic in newly created processes. The message/request is
 	  processed and then the process exits. </p>
           <p>Own Id: OTP-9876</p>
 	</item>
 
         <item>
-          <p>[agent] Documenting previously existing but undocumented function, 
+          <p>[agent] Documenting previously existing but undocumented function,
 	  <seealso marker="snmp_generic#get_table_info">snmp_generic:get_table_info/2</seealso>. </p>
 	  <p>Own Id: OTP-9942</p>
         </item>
 
         <item>
-          <p>[agent] Improve error handling while reading agent config files. 
+          <p>[agent] Improve error handling while reading agent config files.
 	  Some files contain mandatory information and is therefor themself
 	  mandatory. </p>
 	  <p>Own Id: OTP-9943</p>
@@ -1025,10 +1181,10 @@
       <!--
       <list type="bulleted">
         <item>
-          <p>[agent] Simultaneous 
-          <seealso marker="snmpa#backup">snmpa:backup/1,2</seealso> 
+          <p>[agent] Simultaneous
+          <seealso marker="snmpa#backup">snmpa:backup/1,2</seealso>
           calls can interfere.
-          The master agent did not check if a backup was already in 
+          The master agent did not check if a backup was already in
           progress when a backup request was accepted. </p>
           <p>Own Id: OTP-9884</p>
           <p>Aux Id: Seq 11995</p>
@@ -1050,7 +1206,7 @@
   <section>
     <title>SNMP Development Toolkit 4.21.7</title>
     <p>Version 4.21.7 supports code replacement in runtime from/to
-    version 4.21.6, 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1, 4.21, 4.20.1 and 
+    version 4.21.6, 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1, 4.21, 4.20.1 and
     4.20. </p>
 
     <section>
@@ -1060,13 +1216,13 @@
       <!--
       <list type="bulleted">
         <item>
-          <p>[agent] DoS attack using GET-BULK with large value of 
+          <p>[agent] DoS attack using GET-BULK with large value of
           MaxRepetitions.
-          A preventive method has been implementing by simply 
-          limit the number of varbinds that can be included in 
-          a Get-BULK response message. This is specified by the 
-          new config option, 
-          <seealso marker="snmp_app#agent_gb_max_vbs">gb_max_vbs</seealso>. 
+          A preventive method has been implementing by simply
+          limit the number of varbinds that can be included in
+          a Get-BULK response message. This is specified by the
+          new config option,
+          <seealso marker="snmp_app#agent_gb_max_vbs">gb_max_vbs</seealso>.
           </p>
           <p>Own Id: OTP-9700</p>
         </item>
@@ -1084,10 +1240,10 @@
 
       <list type="bulleted">
         <item>
-          <p>[agent] Simultaneous 
-          <seealso marker="snmpa#backup">snmpa:backup/1,2</seealso> 
+          <p>[agent] Simultaneous
+          <seealso marker="snmpa#backup">snmpa:backup/1,2</seealso>
           calls can interfere.
-          The master agent did not check if a backup was already in 
+          The master agent did not check if a backup was already in
           progress when a backup request was accepted. </p>
           <p>Own Id: OTP-9884</p>
           <p>Aux Id: Seq 11995</p>
@@ -1108,7 +1264,7 @@
   <section>
     <title>SNMP Development Toolkit 4.21.6</title>
     <p>Version 4.21.6 supports code replacement in runtime from/to
-    version 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1, 4.21, 4.20.1 and 
+    version 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1, 4.21, 4.20.1 and
     4.20. </p>
 
     <section>
@@ -1119,13 +1275,13 @@
 
       <list type="bulleted">
         <item>
-          <p>[agent] DoS attack using GET-BULK with large value of 
+          <p>[agent] DoS attack using GET-BULK with large value of
           MaxRepetitions.
-          A preventive method has been implementing by simply 
-          limit the number of varbinds that can be included in 
-          a Get-BULK response message. This is specified by the 
-          new config option, 
-          <seealso marker="snmp_app#agent_gb_max_vbs">gb_max_vbs</seealso>. 
+          A preventive method has been implementing by simply
+          limit the number of varbinds that can be included in
+          a Get-BULK response message. This is specified by the
+          new config option,
+          <seealso marker="snmp_app#agent_gb_max_vbs">gb_max_vbs</seealso>.
           </p>
           <p>Own Id: OTP-9700</p>
         </item>
@@ -1142,11 +1298,11 @@
 
       <list type="bulleted">
         <item>
-          <p>[agent] Mib server cache gclimit update function incorrectly calls 
-          age update function. 
-          The gclimit update function, 
-          <seealso marker="snmpa#update_mibs_cache_gclimit">update_mibs_cache_gclimit/1</seealso>, 
-          <em>incorrectly</em> called the age update function, 
+          <p>[agent] Mib server cache gclimit update function incorrectly calls
+          age update function.
+          The gclimit update function,
+          <seealso marker="snmpa#update_mibs_cache_gclimit">update_mibs_cache_gclimit/1</seealso>,
+          <em>incorrectly</em> called the age update function,
           <seealso marker="snmpa#update_mibs_cache_age">update_mibs_cache_age/2</seealso>. </p>
           <p>Johan Claesson</p>
           <p>Own Id: OTP-9868</p>
@@ -1188,18 +1344,18 @@
     <section>
       <title>Fixed Bugs and Malfunctions</title>
 <!--
-      <p>-</p> 
+      <p>-</p>
 -->
 
       <list type="bulleted">
         <item>
-          <p>[agent] Repeated vacm table dumping fails due to file name 
-          conflict. When dumping the vacm table to disk, a temoporary 
-          file with a fixed name was used. If the table dumping 
-          (snmpa_vacm:dump_table/0) was initiated from several different 
-          processes in rapid succesion, the dumping could fail because the 
-          different processes was simultaniously trying to write to the 
-          same file. This problem has been eliminated by creating a unique 
+          <p>[agent] Repeated vacm table dumping fails due to file name
+          conflict. When dumping the vacm table to disk, a temoporary
+          file with a fixed name was used. If the table dumping
+          (snmpa_vacm:dump_table/0) was initiated from several different
+          processes in rapid succesion, the dumping could fail because the
+          different processes was simultaniously trying to write to the
+          same file. This problem has been eliminated by creating a unique
           name for the temporary file. </p>
           <p>Own Id: OTP-9851</p>
           <p>Aux Id: Seq 11980</p>
@@ -1240,7 +1396,7 @@
 <!--
       <list type="bulleted">
         <item>
-          <p>[compiler] Improved version info printout from the 
+          <p>[compiler] Improved version info printout from the
           <seealso marker="snmpc(command)#">MIB compiler frontend escript</seealso>. </p>
           <p>Own Id: OTP-9618</p>
         </item>
@@ -1253,7 +1409,7 @@
     <section>
       <title>Fixed Bugs and Malfunctions</title>
 <!--
-      <p>-</p> 
+      <p>-</p>
 -->
 
       <list type="bulleted">
@@ -1297,7 +1453,7 @@
 
       <list type="bulleted">
         <item>
-          <p>[compiler] Improved version info printout from the 
+          <p>[compiler] Improved version info printout from the
 	  <seealso marker="snmpc(command)#">MIB compiler frontend escript</seealso>. </p>
           <p>Own Id: OTP-9618</p>
         </item>
@@ -1309,27 +1465,27 @@
     <section>
       <title>Fixed Bugs and Malfunctions</title>
 <!--
-      <p>-</p> 
+      <p>-</p>
 -->
 
       <list type="bulleted">
         <item>
-          <p>[agent] Version 4.20 introduced a change that broke trap 
-	  sending from subagents. Due to a bug in the test code, 
+          <p>[agent] Version 4.20 introduced a change that broke trap
+	  sending from subagents. Due to a bug in the test code,
 	  this was not discovered, until that bug was fixed. </p>
           <p>Own Id: OTP-9745</p>
         </item>
 
         <item>
-          <p>[agent] When sending an error message (reply) regarding 
+          <p>[agent] When sending an error message (reply) regarding
 	  <c>snmpUnknownPDUHandlers</c>, the agent used the wrong OID. </p>
           <p>Own Id: OTP-9747</p>
         </item>
 
         <item>
-          <p>[compiler] Fix the <c>--warnings/--W</c> option parsing in the 
+          <p>[compiler] Fix the <c>--warnings/--W</c> option parsing in the
           <seealso marker="snmpc(command)#option_warnings">snmpc</seealso>
-          wrapper (e)script. 
+          wrapper (e)script.
           The short warning option was incorrectly <c>--w</c>, instead
           of as documented <c>--W</c>. This has now been corrected. </p>
           <p>*** POTENTIAL INCOMPATIBILITY ***</p>
@@ -1349,7 +1505,7 @@
 
       <list type="bulleted">
         <item>
-          <p>[compiler] The short warning option has been changed from 
+          <p>[compiler] The short warning option has been changed from
           <c>--w</c> to <c>--W</c> to comply with the documentation. </p>
           <p>Tuncer Ayaz</p>
           <p>Own Id: OTP-9718</p>
@@ -1373,7 +1529,7 @@
 <!--
       <list type="bulleted">
         <item>
-          <p>Bad note store GC timer deactivation. 
+          <p>Bad note store GC timer deactivation.
 	  Wrong field in the state record was set (timeout instead active). </p>
           <p>Stefan Grundmann</p>
           <p>Own Id: OTP-9690</p>
@@ -1387,12 +1543,12 @@
     <section>
       <title>Fixed Bugs and Malfunctions</title>
 <!--
-      <p>-</p> 
+      <p>-</p>
 -->
 
       <list type="bulleted">
         <item>
-          <p>Bad note store GC timer deactivation. 
+          <p>Bad note store GC timer deactivation.
 	  Wrong field in the state record was set (timeout instead active). </p>
           <p>Stefan Grundmann</p>
           <p>Own Id: OTP-9690</p>
@@ -1422,13 +1578,13 @@
 -->
       <list type="bulleted">
         <item>
-          <p>[compiler] Used wrong variable name (for 
-	  warnings-as-errors variable), which caused the 
+          <p>[compiler] Used wrong variable name (for
+	  warnings-as-errors variable), which caused the
 	  compiler to crash when using the snmpc (e)script. </p>
-	  <p>Also added the option 
+	  <p>Also added the option
 	  <seealso marker="snmpc(command)#option_werror">--Werror</seealso>
-	  for the SNMP MIB compiler (escript) frontend (to mimic 
-	  <seealso marker="erts:erlc">erlc</seealso>), 
+	  for the SNMP MIB compiler (escript) frontend (to mimic
+	  <seealso marker="erts:erlc">erlc</seealso>),
 	  which specifies whether warnings should be treated as errors. </p>
           <p>Own Id: OTP-9447</p>
         </item>
@@ -1443,12 +1599,12 @@
 
     <section>
       <title>Fixed Bugs and Malfunctions</title>
-      <p>-</p> 
+      <p>-</p>
 
 <!--
       <list type="bulleted">
         <item>
-          <p>The snmp config tool could not handle (manager) audit trail config 
+          <p>The snmp config tool could not handle (manager) audit trail config
 	  because the option seqno was not handled. </p>
 	  <p>Own Id: OTP-9354</p>
 	</item>
@@ -1478,15 +1634,15 @@
 -->
       <list type="bulleted">
         <item>
-          <p>[manager] There was no way to specify transport domain. 
+          <p>[manager] There was no way to specify transport domain.
 	  The transport domains was assumed to be IPv4 (transportDomainUdpIpv4).
-	  This has now been changed so that it can also be IPv6 
-	  (transportDomainUdpIpv6). 
-	  To facilitate this, the transport domain, <c>tdomain</c>, 
-	  is now a (new) valid option when 
+	  This has now been changed so that it can also be IPv6
+	  (transportDomainUdpIpv6).
+	  To facilitate this, the transport domain, <c>tdomain</c>,
+	  is now a (new) valid option when
 	  <seealso marker="snmpm#register_agent">registering</seealso>
-	  a new agent (and 
-	  <seealso marker="snmpm#update_agent_info">updating</seealso> 
+	  a new agent (and
+	  <seealso marker="snmpm#update_agent_info">updating</seealso>
 	  agent info). </p>
 	  <p>This also mean that the transport behaviour has changed. </p>
           <p>Own Id: OTP-9305</p>
@@ -1494,10 +1650,10 @@
         </item>
 
         <item>
-          <p>[compiler] Added the option 
-	  <seealso marker="snmpc#compile">warnings_as_errors</seealso> 
-	  (for the SNMP MIB compiler (escript) frontend, the option 
-	  <seealso marker="snmpc(command)#option_wae">--wae</seealso> is used) 
+          <p>[compiler] Added the option
+	  <seealso marker="snmpc#compile">warnings_as_errors</seealso>
+	  (for the SNMP MIB compiler (escript) frontend, the option
+	  <seealso marker="snmpc(command)#option_wae">--wae</seealso> is used)
 	  which specifies whether warnings should be treated as errors. </p>
           <p>Tuncer Ayaz</p>
           <p>Own Id: OTP-9437</p>
@@ -1509,12 +1665,12 @@
     <section>
       <title>Fixed Bugs and Malfunctions</title>
 <!--
-      <p>-</p> 
+      <p>-</p>
 -->
 
       <list type="bulleted">
         <item>
-          <p>The snmp config tool could not handle (manager) audit trail config 
+          <p>The snmp config tool could not handle (manager) audit trail config
 	  because the option seqno was not handled. </p>
 	  <p>Own Id: OTP-9354</p>
 	</item>
@@ -1568,11 +1724,11 @@
     <section>
       <title>Fixed Bugs and Malfunctions</title>
 <!--
-      <p>-</p> 
+      <p>-</p>
 -->
       <list type="bulleted">
         <item>
-          <p>[agent] Did not handle transport domains properly in some cases, 
+          <p>[agent] Did not handle transport domains properly in some cases,
 	  for instance trap sending. </p>
 	  <p>Own Id: OTP-9400</p>
 	</item>
@@ -1609,9 +1765,9 @@
       <list type="bulleted">
         <item>
           <p>[agent] Added support for sending traps to IPv6 targets. </p>
-	  <p>See the 
-	  <seealso marker="snmp_agent_config_files#target_addr">target address config file</seealso>, 
-	  the <seealso marker="snmpa_conf#target_addr_entry">target_addr_entry/11</seealso> function or 
+	  <p>See the
+	  <seealso marker="snmp_agent_config_files#target_addr">target address config file</seealso>,
+	  the <seealso marker="snmpa_conf#target_addr_entry">target_addr_entry/11</seealso> function or
 	  <seealso marker="snmp_target_mib#add_addr">add_addr/11</seealso> for more info. </p>
           <p>Own Id: OTP-9088</p>
           <p>Aux Id: Seq 11790</p>
@@ -1620,7 +1776,7 @@
 
         <item>
           <p>[agent] To be able to handle multiple engine-id(s) when
-	  sending trap(s), the function 
+	  sending trap(s), the function
           <seealso marker="snmp_community_mib#add_community">
 	  add_community/6</seealso> has been added. </p>
           <p>Own Id: OTP-9119</p>
@@ -1630,14 +1786,14 @@
         <item>
           <p>[manager] The API for snmp requests has been augmented to
 	  allow the caller to override some configuration. </p>
-	  <p>This has been done by introducing a new set of API functions, see 
-	  <seealso marker="snmpm#sync_get2">sync_get2/3,4</seealso>, 
-	  <seealso marker="snmpm#async_get2">async_get2/3,4</seealso>, 
-	  <seealso marker="snmpm#sync_get_next2">sync_get_next2/3,4</seealso>, 
-	  <seealso marker="snmpm#async_get_next2">async_get_next2/3,4</seealso>, 
-	  <seealso marker="snmpm#sync_get_bulk2">sync_get_bulk2/5,6</seealso>, 
-	  <seealso marker="snmpm#async_get_bulk2">async_get_bulk2/5,6</seealso>, 
-	  <seealso marker="snmpm#sync_set2">sync_set2/3,4</seealso> and 
+	  <p>This has been done by introducing a new set of API functions, see
+	  <seealso marker="snmpm#sync_get2">sync_get2/3,4</seealso>,
+	  <seealso marker="snmpm#async_get2">async_get2/3,4</seealso>,
+	  <seealso marker="snmpm#sync_get_next2">sync_get_next2/3,4</seealso>,
+	  <seealso marker="snmpm#async_get_next2">async_get_next2/3,4</seealso>,
+	  <seealso marker="snmpm#sync_get_bulk2">sync_get_bulk2/5,6</seealso>,
+	  <seealso marker="snmpm#async_get_bulk2">async_get_bulk2/5,6</seealso>,
+	  <seealso marker="snmpm#sync_set2">sync_set2/3,4</seealso> and
 	  <seealso marker="snmpm#async_set2">async_set2/3,4</seealso>
 	  for more info. </p>
           <p>Own Id: OTP-9162</p>
@@ -1645,8 +1801,8 @@
 
         <item>
           <p>[manager] The old API functions (for get and set
-	  requests: 
-	  snmpm:g/3,4,5,6,7, snmpm:ag/3,4,5,6,7, 
+	  requests:
+	  snmpm:g/3,4,5,6,7, snmpm:ag/3,4,5,6,7,
 	  snmpm:gn/3,4,5,6,7, snmpm:agn/3,4,5,6,7,
 	  snmpm:s/3,4,5,6,7, snmpm:s/3,4,5,6,7,
 	  snmpm:gb/5,6,7,8,9 and snmpm:agb/5,6,7,8,9)
@@ -1658,12 +1814,12 @@
         <item>
           <p>[agent] Pass extra info through the agent to the net-if
 	  process when sending notifications. </p>
-	  <p>See 
+	  <p>See
 	  <seealso marker="snmpa#send_notification2">
-	  snmpa:send_notification2/3</seealso> for more info. 
-	  See also the incomming net-if messages when sending a 
-	  <seealso marker="snmp_agent_netif#im_send_pdu">trap</seealso> 
-	  (send_pdu message) and 
+	  snmpa:send_notification2/3</seealso> for more info.
+	  See also the incomming net-if messages when sending a
+	  <seealso marker="snmp_agent_netif#im_send_pdu">trap</seealso>
+	  (send_pdu message) and
 	  <seealso marker="snmp_agent_netif#im_send_pdu_req">
 	  notification</seealso> (send_pdu_req message). </p>
           <p>Own Id: OTP-9183</p>
@@ -1681,15 +1837,15 @@
     <section>
       <title>Fixed Bugs and Malfunctions</title>
 <!--
-      <p>-</p> 
+      <p>-</p>
 -->
 
       <list type="bulleted">
         <item>
           <p>Fixed endode/decode of values of type <c>Counter32</c>. </p>
-	  <p>This type (<c>Counter32</c>) is an unsigned integer 32, 
-	  but is actually encoded as an signed integer 32. 
-	  The encode/decode functions however, treated it as if it was 
+	  <p>This type (<c>Counter32</c>) is an unsigned integer 32,
+	  but is actually encoded as an signed integer 32.
+	  The encode/decode functions however, treated it as if it was
 	  encodeded as an unsigned integer 32. </p>
 	  <p>Own Id: OTP-9022</p>
 	</item>
@@ -1704,12 +1860,4 @@
     </section>
 
   </section> <!-- 4.20 -->
-
-
-  <!-- section>
-    <title>Release notes history</title>
-    <p>For information about older versions see
-      <url href="part_notes_history_frame.html">release notes history</url>.</p>
-  </section -->
 </chapter>
-
diff --git a/lib/snmp/doc/src/part_notes.xml b/lib/snmp/doc/src/part_notes.xml
deleted file mode 100644
index d149044169..0000000000
--- a/lib/snmp/doc/src/part_notes.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>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>SNMP Release Notes</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-    <file>part_notes.xml</file>
-  </header>
-  <description>
-    <p>A multilingual Simple Network Management Protocol application,
-      featuring an Extensible Agent, a simple manager and a MIB 
-      compiler and facilities for implementing SNMP MIBs etc.</p>
-    <p>For information about older versions see
-      <url href="part_notes_history_frame.html">release notes history</url>.</p>
-  </description>
-  <xi:include href="notes.xml"/>
-</part>
-
diff --git a/lib/snmp/doc/src/part_notes_history.xml b/lib/snmp/doc/src/part_notes_history.xml
deleted file mode 100644
index aa5276dc94..0000000000
--- a/lib/snmp/doc/src/part_notes_history.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part>
-  <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>SNMP Release Notes History</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date></date>
-    <rev></rev>
-    <file>part_notes_history.xml</file>
-  </header>
-  <description>
-    <p>A multilingual Simple Network Management Protocol application,
-      featuring an Extensible Agent, a simple manager and a MIB 
-      compiler and facilities for implementing SNMP MIBs etc.</p>
-  </description>
-  <include file="notes_history"></include>
-</part>
-
diff --git a/lib/snmp/doc/src/ref_man.gif b/lib/snmp/doc/src/ref_man.gif
deleted file mode 100644
index b13c4efd53..0000000000
--- a/lib/snmp/doc/src/ref_man.gif
+++ /dev/null
diff --git a/lib/snmp/doc/src/snmp.gif b/lib/snmp/doc/src/snmp.gif
deleted file mode 100644
index d9985f990b..0000000000
--- a/lib/snmp/doc/src/snmp.gif
+++ /dev/null
diff --git a/lib/snmp/doc/src/snmp.xml b/lib/snmp/doc/src/snmp.xml
index 801193675c..480ed2e825 100644
--- a/lib/snmp/doc/src/snmp.xml
+++ b/lib/snmp/doc/src/snmp.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>
@@ -341,10 +341,10 @@
     </func>
 
     <func>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile) ->  ok | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block | Start) ->  ok | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Block | Stop) -> ok | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop, Block) -> ok | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block | Start) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Block | Stop) -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop, Block) -> ok | {ok, Cnt} | {error, Reason}</name>
       <fsummary>Convert an Audit Trail Log to text format</fsummary>
       <type>
         <v>LogDir = string()</v>
@@ -355,6 +355,9 @@
         <v>LogFile = string()</v>
         <v>Start = Stop = null | datetime() | {local_time,datetime()} |  {universal_time,datetime()} </v>
         <v>Block = boolean()</v>
+        <v>Cnt = {NumOK, NumERR}</v>
+        <v>NumOK = non_neg_integer()</v>
+        <v>NumERR = pos_integer()</v>
         <v>Reason = term()</v>
       </type>
       <desc>
@@ -394,16 +397,25 @@
 	and <c>Vsn</c> is the SNMP version. <c>PDU</c> is a textual
 	version of the protocol data unit. There is a new line
 	between <c>Vsn</c> and <c>PDU</c>.</p>
+
+	<p>If the entire log is successfully converted, the function 
+	will return <c>ok</c>. 
+	If one of more entries fail to convert, the function will instead
+	return <c>{ok, {NumOK, NumERR}}</c>, where the counters indicate
+	how many valid and erroneous entries where found. 
+	If instead <c>{error, Reason}</c> is returned, the conversion 
+	encountered a fatal error and where either never done of aborted
+	midway. </p>
 	
         <marker id="log_to_io"></marker>
       </desc>
     </func>
 
     <func>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile) ->  ok | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Block | Start) ->  ok | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Start, Block | Stop) -> ok | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop, Block) -> ok | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, LogName, LogFile) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Block | Start) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Start, Block | Stop) -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop, Block) -> ok | {ok, Cnt} | {error, Reason}</name>
       <fsummary>Convert an Audit Trail Log to text format</fsummary>
       <type>
         <v>LogDir = string()</v>
@@ -412,6 +424,9 @@
         <v>LogName = string()</v>
         <v>LogFile = string()</v>
         <v>Start = Stop = null | datetime() | {local_time,datetime()} |  {universal_time,datetime()} </v>
+        <v>Cnt = {NumOK, NumERR}</v>
+        <v>NumOK = non_neg_integer()</v>
+        <v>NumERR = pos_integer()</v>
         <v>Reason = term()</v>
       </type>
       <desc>
diff --git a/lib/snmp/doc/src/snmp_impl_example_agent.xml b/lib/snmp/doc/src/snmp_impl_example_agent.xml
index a86006a0a7..7dda3dd5cd 100644
--- a/lib/snmp/doc/src/snmp_impl_example_agent.xml
+++ b/lib/snmp/doc/src/snmp_impl_example_agent.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>
@@ -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/doc/src/snmpa.xml b/lib/snmp/doc/src/snmpa.xml
index d756ff7a65..b78f14da01 100644
--- a/lib/snmp/doc/src/snmpa.xml
+++ b/lib/snmp/doc/src/snmpa.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>
@@ -559,13 +559,13 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     <func>
       <name>log_to_txt(LogDir)</name>
       <name>log_to_txt(LogDir, Block | Mibs)</name>
-      <name>log_to_txt(LogDir, Mibs, Block | OutFile) -> ok | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, Block | LogName) ->  ok | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, Block | LogFile) ->  ok | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block | Start) ->  ok | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start)  -> ok | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop)  -> ok | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop)  -> ok | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, Block | OutFile) -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, OutFile, Block | LogName) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, Block | LogFile) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block | Start) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start)  -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop)  -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop)  -> ok | {ok, Cnt} | {error, Reason}</name>
       <fsummary>Convert an Audit Trail Log to text format</fsummary>
       <type>
         <v>LogDir = string()</v>
@@ -576,6 +576,9 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
         <v>LogName = string()</v>
         <v>LogFile = string()</v>
         <v>Start = Stop = null | calendar:datetime() | {local_time, calendar:datetime()} | {universal_time, calendar:datetime()} </v>
+        <v>Cnt = {NumOK, NumERR}</v>
+        <v>NumOK = non_neg_integer()</v>
+        <v>NumERR = pos_integer()</v>
         <v>Reason = disk_log_open_error() | file_open_error() | term()</v>
         <v>disk_log_open_error() = {LogName, term()}</v>
         <v>file_open_error() = {OutFile, term()}</v>
@@ -597,14 +600,14 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>log_to_io(LogDir) ->  ok | {error, Reason}</name>
-      <name>log_to_io(LogDir, Block | Mibs) ->  ok | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, Block | LogName) ->  ok | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, Block | LogFile) -> ok | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Block | Start) -> ok | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start) -> ok | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop) -> ok | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop) -> ok | {error, Reason}</name>
+      <name>log_to_io(LogDir) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_io(LogDir, Block | Mibs) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, Block | LogName) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, LogName, Block | LogFile) -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Block | Start) -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start) -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop) -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop) -> ok | {ok, Cnt} | {error, Reason}</name>
       <fsummary>Convert an Audit Trail Log to text format</fsummary>
       <type>
         <v>LogDir = string()</v>
@@ -614,6 +617,9 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
         <v>LogName = string()</v>
         <v>LogFile = string()</v>
         <v>Start = Stop = null | calendar:datetime() | {local_time, calendar:datetime()} | {universal_time, calendar:datetime()} </v>
+        <v>Cnt = {NumOK, NumERR}</v>
+        <v>NumOK = non_neg_integer()</v>
+        <v>NumERR = pos_integer()</v>
         <v>Reason = disk_log_open_error() | file_open_error() | term()</v>
         <v>disk_log_open_error() = {LogName, term()}</v>
         <v>file_open_error() = {OutFile, term()}</v>
diff --git a/lib/snmp/doc/src/snmpm.xml b/lib/snmp/doc/src/snmpm.xml
index 4818aeb697..be4cd58a1a 100644
--- a/lib/snmp/doc/src/snmpm.xml
+++ b/lib/snmp/doc/src/snmpm.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>
@@ -1216,13 +1216,13 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     <func>
       <name>log_to_txt(LogDir)</name>
       <name>log_to_txt(LogDir, Block | Mibs)</name>
-      <name>log_to_txt(LogDir, Mibs, Block | OutFile) -> ok | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, Block | LogName) ->  ok | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, Block | LogFile) ->  ok | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block | Start) ->  ok | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start)  -> ok | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop)  -> ok | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop)  -> ok | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, Block | OutFile) -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, OutFile, Block | LogName) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, Block | LogFile) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block | Start) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start)  -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop)  -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop)  -> ok | {ok, Cnt} | {error, Reason}</name>
       <fsummary>Convert an Audit Trail Log to text format</fsummary>
       <type>
         <v>LogDir = string()</v>
@@ -1233,6 +1233,9 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
         <v>LogName = string()</v>
         <v>LogFile = string()</v>
         <v>Start = Stop = null | calendar:datetime() | {local_time, calendar:datetime()} | {universal_time, calendar:datetime()} </v>
+        <v>Cnt = {NumOK, NumERR}</v>
+        <v>NumOK = non_neg_integer()</v>
+        <v>NumERR = pos_integer()</v>
         <v>Reason = disk_log_open_error() | file_open_error() | term()</v>
         <v>disk_log_open_error() = {LogName, term()}</v>
         <v>file_open_error() = {OutFile, term()}</v>
@@ -1254,15 +1257,15 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>log_to_io(LogDir) -> ok | {error, Reason}</name>
-      <name>log_to_io(LogDir, Block | Mibs) -> ok | {error, Reason}</name>
+      <name>log_to_io(LogDir) -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_io(LogDir, Block | Mibs) -> ok | {ok, Cnt} | {error, Reason}</name>
       <name>log_to_io(LogDir, Mibs) -> ok | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, Block | LogName) ->  ok | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, Block | LogFile) ->  ok | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Block | Start) ->  ok | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start)  -> ok | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop)  -> ok | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop)  -> ok | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, Block | LogName) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, LogName, Block | LogFile) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Block | Start) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start)  -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop)  -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop)  -> ok | {ok, Cnt} | {error, Reason}</name>
       <fsummary>Convert an Audit Trail Log to text format</fsummary>
       <type>
         <v>LogDir = string()</v>
@@ -1272,6 +1275,9 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
         <v>LogName = string()</v>
         <v>LogFile = string()</v>
         <v>Start = Stop = null | calendar:datetime() | {local_time, calendar:datetime()} | {universal_time, calendar:datetime()} </v>
+        <v>Cnt = {NumOK, NumERR}</v>
+        <v>NumOK = non_neg_integer()</v>
+        <v>NumERR = pos_integer()</v>
         <v>Reason = disk_log_open_error() | file_open_error() | term()</v>
         <v>disk_log_open_error() = {LogName, term()}</v>
         <v>file_open_error() = {OutFile, term()}</v>
diff --git a/lib/snmp/doc/src/summary.html.src b/lib/snmp/doc/src/summary.html.src
deleted file mode 100644
index 9bad4adbeb..0000000000
--- a/lib/snmp/doc/src/summary.html.src
+++ /dev/null
@@ -1 +0,0 @@
-Simple Network Management Protocol (SNMP) support including a MIB compiler, a simple SNMP manager and tools for creating SNMP agents
diff --git a/lib/snmp/doc/src/user_guide.gif b/lib/snmp/doc/src/user_guide.gif
deleted file mode 100644
index e6275a803d..0000000000
--- a/lib/snmp/doc/src/user_guide.gif
+++ /dev/null
diff --git a/lib/snmp/doc/src/warning.gif b/lib/snmp/doc/src/warning.gif
deleted file mode 100644
index 96af52360e..0000000000
--- a/lib/snmp/doc/src/warning.gif
+++ /dev/null
diff --git a/lib/snmp/src/agent/snmp_generic.erl b/lib/snmp/src/agent/snmp_generic.erl
index fc23e16ef1..e67a1b3c80 100644
--- a/lib/snmp/src/agent/snmp_generic.erl
+++ b/lib/snmp/src/agent/snmp_generic.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. 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.
@@ -413,20 +413,21 @@ table_check_status(NameDb, Col, ?'RowStatus_createAndGo', RowIndex, Cols) ->
 	false -> 
 	    % it's ok to use snmpa_local_db:table_construct_row since it's
 	    % side effect free and we only use the result temporary.
-	    case catch snmpa_local_db:table_construct_row(
+	    try snmpa_local_db:table_construct_row(
 			 NameDb, RowIndex, ?'RowStatus_createAndGo', Cols) of
-		{'EXIT', _Reason} ->
-		    ?vtrace(
-		       "failed construct row (createAndGo): "
-		       " n   Reason: ~p"
-		       " n   Stack:  ~p",
-		       [_Reason, erlang:get_stacktrace()]),
-		    {noCreation, Col}; % Bad RowIndex
 		Row ->
 		    case lists:member(noinit, tuple_to_list(Row)) of
 			false -> {noError, 0};
 			_Found -> {inconsistentValue, Col}
 		    end
+            catch
+                _:_Reason ->
+		    ?vtrace(
+		       "failed construct row (createAndGo): "
+		       " n   Reason: ~p"
+		       " n   Stack:  ~p",
+		       [_Reason, erlang:get_stacktrace()]),
+		    {noCreation, Col}           % Bad RowIndex
 	    end;
 	true -> {inconsistentValue, Col}
     end;
@@ -435,17 +436,18 @@ table_check_status(NameDb, Col, ?'RowStatus_createAndGo', RowIndex, Cols) ->
 table_check_status(NameDb, Col, ?'RowStatus_createAndWait', RowIndex, Cols) ->
     case table_row_exists(NameDb, RowIndex) of
 	false ->
-	    case catch snmpa_local_db:table_construct_row(
+	    try snmpa_local_db:table_construct_row(
 			 NameDb, RowIndex, ?'RowStatus_createAndGo', Cols) of
-		{'EXIT', _Reason} ->
+		_Row ->
+		    {noError, 0}
+            catch
+                _:_Reason ->
 		    ?vtrace(
 		       "failed construct row (createAndWait): "
 		       " n   Reason: ~p"
 		       " n   Stack:  ~p",
 		       [_Reason, erlang:get_stacktrace()]),
-		    {noCreation, Col}; % Bad RowIndex
-		_Row ->
-		    {noError, 0}
+		    {noCreation, Col}           % Bad RowIndex
 	    end;
 	true -> {inconsistentValue, Col}
     end;
diff --git a/lib/snmp/src/agent/snmpa_net_if.erl b/lib/snmp/src/agent/snmpa_net_if.erl
index ecf9498ca9..afed4482d2 100644
--- a/lib/snmp/src/agent/snmpa_net_if.erl
+++ b/lib/snmp/src/agent/snmpa_net_if.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.
@@ -137,11 +137,10 @@ init(Prio, NoteStore, MasterAgent, Parent, Opts) ->
 	    proc_lib:init_ack({ok, self()}),
 	    try loop(State)
 	    catch
-		C:E when C =/= exit, E =/= shutdown ->
+		C:E:S when C =/= exit, E =/= shutdown ->
 		    Fmt =
 			"loop/1 EXCEPTION ~w:~w~n"
 			"   ~p",
-		    S = erlang:get_stacktrace(),
 		    case C of
 			exit ->
 			    %% Externally killed, root cause is elsewhere
@@ -647,10 +646,10 @@ maybe_handle_recv(
     case
 	try FilterMod:accept_recv(From_1, From_2)
 	catch
-	    Class:Exception ->
+	    Class:Exception:StackTrace ->
 		error_msg(
 		  "FilterMod:accept_recv(~p, ~p) crashed: ~w:~w~n    ~p",
-		  [From_1,From_2,Class,Exception,erlang:get_stacktrace()]),
+		  [From_1, From_2, Class, Exception, StackTrace]),
 		true
 	end
     of
@@ -753,12 +752,11 @@ maybe_handle_recv_pdu(
     case
 	try FilterMod:accept_recv_pdu(From_1, From_2, Type)
 	catch
-	    Class:Exception ->
+	    Class:Exception:StackTrace ->
 		error_msg(
 		  "FilterMod:accept_recv_pdu(~p, ~p, ~p) crashed: ~w:~w~n"
 		  "    ~p",
-		  [From_1,From_2,Type,Class,Exception,
-		   erlang:get_stacktrace()]),
+		  [From_1, From_2, Type, Class, Exception, StackTrace]),
 		true
 	end
     of
@@ -834,11 +832,10 @@ maybe_handle_reply_pdu(
 	try
 	    FilterMod:accept_send_pdu(Addresses, Type)
 	catch
-	    Class:Exception ->
+	    Class:Exception:StackTrace ->
 		error_msg(
 		  "FilterMod:accept_send_pdu(~p, ~p) crashed: ~w:~w~n    ~p",
-		  [Addresses, Type, Class, Exception,
-		   erlang:get_stacktrace()]),
+		  [Addresses, Type, Class, Exception, StackTrace]),
 		true
 	end
     of
@@ -872,7 +869,7 @@ handle_reply_pdu(
 						ACMData, LogF)) of
 	{ok, Packet} ->
 	    ?vinfo("time in agent: ~w mysec", [time_in_agent()]),
-	    try maybe_udp_send(S, Transport, To, Packet)
+	    try maybe_udp_send_wo_log(S, Transport, To, Packet)
 	    catch
 		{Reason, Sz} ->
 		    error_msg("Cannot send message "
@@ -917,11 +914,10 @@ maybe_handle_send_pdu(
     case
 	try FilterMod:accept_send_pdu(AddressesToFilter, Type)
 	catch
-	    Class:Exception ->
+	    Class:Exception:StackTrace ->
 		error_msg(
 		  "FilterMod:accept_send_pdu(~p, ~p) crashed: ~w:~w~n    ~p",
-		  [AddressesToFilter,Type,
-		   Class,Exception,erlang:get_stacktrace()]),
+		  [AddressesToFilter, Type, Class, Exception, StackTrace]),
 		true
 	end
     of
@@ -1049,46 +1045,36 @@ do_handle_send_pdu(S, Type, Pdu, Addresses) ->
 	      [Sz, Reason, Pdu])
     end.
 
-do_handle_send_pdu1(
-  #state{transports = Transports} = S,
-  Type, Addresses) ->
+do_handle_send_pdu1(S, Type, Addresses) ->
     lists:foreach(
-      fun ({Domain, Address, Packet}) when is_binary(Packet) ->
-	      ?vdebug(
-		 "[~w] sending packet:~n"
-		 "   size: ~p~n"
-		 "   to:   ~p", [Domain, sz(Packet), Address]),
-	      To = {Domain, Address},
-	      case select_transport_from_domain(Domain, Transports) of
-		  false ->
-		      error_msg(
-			"Can not find transport~n"
-			"   size:   ~p~n"
-			"   to:     ~s",
-			[sz(Packet), format_address(To)]);
-		  Transport ->
-		      maybe_udp_send(S, Transport, To, Packet)
-	      end;
-	  ({Domain, Address, {Packet, LogData}}) when is_binary(Packet) ->
-	      ?vdebug(
-		 "[~w] sending encrypted packet:~n"
-		 "   size: ~p~n"
-		 "   to:   ~p", [Domain, sz(Packet), Address]),
-	      To = {Domain, Address},
-	      case select_transport_from_domain(Domain, Transports) of
-		  false ->
-		      error_msg(
-			"Can not find transport~n"
-			"   size:   ~p~n"
-			"   to:     ~s",
-			[sz(Packet), format_address(To)]);
-		  Transport ->
-		      maybe_udp_send(S, Transport, To, Packet, Type, LogData)
-	      end
+      fun ({Domain, Address, Pkg}) when is_binary(Pkg) ->
+	      do_handle_send_pdu2(S, Type, Domain, Address,
+                                  Pkg, Pkg, "");
+	  ({Domain, Address, {Pkg, LogPkg}}) when is_binary(Pkg) ->
+	      do_handle_send_pdu2(S, Type, Domain, Address,
+                                  Pkg, LogPkg, " encrypted")
       end,
       Addresses).
 
-maybe_udp_send(
+do_handle_send_pdu2(#state{transports = Transports} = S,
+                    Type, Domain, Address, Pkg, LogPkg, EncrStr) ->
+    ?vdebug("[~w] sending~s packet:"
+            "~n   size: ~p"
+            "~n   to:   ~p", [Domain, EncrStr, sz(Pkg), Address]),
+    To = {Domain, Address},
+    case select_transport_from_domain(Domain, Transports) of
+	false ->
+	    error_msg("Can not find transport: "
+                      "~n   size: ~p"
+                      "~n   to:   ~s",
+                      [sz(Pkg), format_address(To)]);
+	Transport ->
+	    maybe_udp_send_w_log(S, Transport, To, Pkg, LogPkg, Type)
+    end.
+
+
+%% This function is used when logging has already been done!
+maybe_udp_send_wo_log(
   #state{filter = FilterMod, transports = Transports},
   #transport{socket = Socket},
   To, Packet) ->
@@ -1096,10 +1082,10 @@ maybe_udp_send(
     case
 	try FilterMod:accept_send(To_1, To_2)
 	catch
-	    Class:Exception ->
+	    Class:Exception:StackTrace ->
 		error_msg(
 		  "FilterMod:accept_send(~p, ~p) crashed: ~w:~w~n    ~p",
-		  [To_1,To_2,Class,Exception,erlang:get_stacktrace()]),
+		  [To_1, To_2, Class, Exception, StackTrace]),
 		true
 	end
     of
@@ -1118,18 +1104,18 @@ maybe_udp_send(
 	    udp_send(Socket, To, Packet)
     end.
 
-maybe_udp_send(
+maybe_udp_send_w_log(
   #state{log = Log, filter = FilterMod, transports = Transports},
   #transport{socket = Socket},
-  To, Packet, Type, _LogData) ->
+  To, Pkg, LogPkg, Type) ->
     {To_1, To_2} = fix_filter_address(Transports, To),
     case
 	try FilterMod:accept_send(To_1, To_2)
 	catch
-	    Class:Exception ->
+	    Class:Exception:StackTrace ->
 		error_msg(
 		  "FilterMod:accept_send(~p, ~p) crashed for: ~w:~w~n    ~p",
-		  [To_1, To_2, Class, Exception, erlang:get_stacktrace()]),
+		  [To_1, To_2, Class, Exception, StackTrace]),
 		true
 	end
     of
@@ -1143,10 +1129,10 @@ maybe_udp_send(
 		_ ->
 		    error_msg(
 		      "FilterMod:accept_send(~p, ~p) returned: ~p",
-		      [To_1,To_2,Other])
+		      [To_1, To_2, Other])
 	    end,
-	    log(Log, Type, Packet, To),
-	    udp_send(Socket, To, Packet)
+	    log(Log, Type, LogPkg, To),
+	    udp_send(Socket, To, Pkg)
     end.
 
 udp_send(Socket, To, B) ->
@@ -1168,11 +1154,10 @@ udp_send(Socket, To, B) ->
 	ok ->
 	    ok
     catch
-	error:ExitReason ->
+	error:ExitReason:StackTrace ->
 	    error_msg("[exit] cannot send message "
 		      "(destination: ~p:~p, size: ~p, reason: ~p, at: ~p)",
-		      [IpAddr, IpPort, sz(B), ExitReason,
-		       erlang:get_stacktrace()])
+		      [IpAddr, IpPort, sz(B), ExitReason, StackTrace])
     end.
 
 sz(L) when is_list(L) -> length(L);
diff --git a/lib/snmp/src/app/snmp.app.src b/lib/snmp/src/app/snmp.app.src
index d25f66f44a..d4bf0de61a 100644
--- a/lib/snmp/src/app/snmp.app.src
+++ b/lib/snmp/src/app/snmp.app.src
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2015. All Rights Reserved.
+%% 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.
diff --git a/lib/snmp/src/app/snmp.erl b/lib/snmp/src/app/snmp.erl
index df3933ea01..8a736f688b 100644
--- a/lib/snmp/src/app/snmp.erl
+++ b/lib/snmp/src/app/snmp.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. 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.
@@ -573,9 +573,16 @@ print_mod_info(Prefix, {Module, Info}) ->
     CompDate =
         case key1search(compile_time, Info) of
             {value, {Year, Month, Day, Hour, Min, Sec}} ->
-                lists:flatten(
-                  io_lib:format("~w-~2..0w-~2..0w ~2..0w:~2..0w:~2..0w",
-                                [Year, Month, Day, Hour, Min, Sec]));
+                io_lib:format(
+		  "~w-~2..0w-~2..0w ~2..0w:~2..0w:~2..0w",
+		  [Year, Month, Day, Hour, Min, Sec]);
+            _ ->
+                "Not found"
+        end,
+    Digest =
+        case key1search(md5, Info) of
+            {value, MD5} when is_binary(MD5) ->
+		[io_lib:format("~2.16.0b", [Byte]) || <<Byte>> <= MD5];
             _ ->
                 "Not found"
         end,
@@ -583,12 +590,14 @@ print_mod_info(Prefix, {Module, Info}) ->
               "~s      Vsn:          ~s~n"
               "~s      App vsn:      ~s~n"
               "~s      Compiler ver: ~s~n"
-              "~s      Compile time: ~s~n",
+	      "~s      Compile time: ~s~n"
+              "~s      MD5 digest:   ~s~n",
               [Prefix, Module, 
 	       Prefix, Vsn, 
 	       Prefix, AppVsn, 
-	       Prefix, CompVer, 
-	       Prefix, CompDate]),
+	       Prefix, CompVer,
+	       Prefix, CompDate,
+	       Prefix, Digest]),
     ok.
 
 key1search(Key, Vals) ->
@@ -617,7 +626,7 @@ versions1() ->
         Error ->
             Error
     end.
- 
+
 versions2() ->
     case ms2() of
         {ok, Mods} ->
@@ -625,25 +634,56 @@ versions2() ->
         Error ->
             Error
     end.
- 
+
 version_info(Mods) ->
     SysInfo = sys_info(),
     OsInfo  = os_info(),
     ModInfo = [mod_version_info(Mod) || Mod <- Mods],
     [{sys_info, SysInfo}, {os_info, OsInfo}, {mod_info, ModInfo}].
-     
+
 mod_version_info(Mod) ->
     Info = Mod:module_info(),
-    {value, {attributes, Attr}}   = lists:keysearch(attributes, 1, Info),
-    {value, {vsn,        [Vsn]}}  = lists:keysearch(vsn,        1, Attr),
-    {value, {app_vsn,    AppVsn}} = lists:keysearch(app_vsn,    1, Attr),
-    {value, {compile,    Comp}}   = lists:keysearch(compile,    1, Info),
-    {value, {version,    Ver}}    = lists:keysearch(version,    1, Comp),
-    {value, {time,       Time}}   = lists:keysearch(time,       1, Comp),
-    {Mod, [{vsn,              Vsn},
-           {app_vsn,          AppVsn},
-           {compiler_version, Ver},
-           {compile_time,     Time}]}.
+    {Mod,
+     case key1search(attributes, Info) of
+	 {value, Attr} ->
+	     case key1search(vsn, Attr) of
+		 {value, [Vsn]} ->
+		     [{vsn, Vsn}];
+		 not_found ->
+		     []
+	     end ++
+		 case key1search(app_vsn, Attr) of
+		     {value, AppVsn} ->
+			 [{app_vsn, AppVsn}];
+		     not_found ->
+			 []
+		 end;
+	 not_found ->
+	     []
+     end ++
+	 case key1search(compile, Info) of
+	     {value, Comp} ->
+		 case key1search(version, Comp) of
+		     {value, Ver} ->
+			 [{compiler_version, Ver}];
+		     not_found ->
+			 []
+		 end ++
+		     case key1search(time, Comp) of
+			 {value, Ver} ->
+			     [{compile_time, Ver}];
+			 not_found ->
+			     []
+		     end;
+	     not_found ->
+		 []
+	 end ++
+	 case key1search(md5, Info) of
+	     {value, Bin} ->
+		 [{md5, Bin}];
+	     not_found ->
+		 []
+	 end}.
 
 sys_info() ->
     SysArch = string:strip(erlang:system_info(system_architecture),right,$\n),
diff --git a/lib/snmp/src/compile/snmpc.erl b/lib/snmp/src/compile/snmpc.erl
index d86692aaf6..c810bfcd41 100644
--- a/lib/snmp/src/compile/snmpc.erl
+++ b/lib/snmp/src/compile/snmpc.erl
@@ -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.
@@ -169,11 +169,7 @@ get_version() ->
     MI   = ?MODULE:module_info(),
     Attr = get_info(attributes, MI),
     Vsn  = get_info(app_vsn, Attr),
-    Comp = get_info(compile, MI),
-    Time = get_info(time, Comp),
-    {Year, Month, Day, Hour, Min, Sec} = Time,
-    io_lib:format("~s [~.4w-~.2.0w-~.2.0w ~.2.0w:~.2.0w:~.2.0w]", 
-		  [Vsn, Year, Month, Day, Hour, Min, Sec]).
+    Vsn.
 
 maybe_display_options(Opts) ->
     case lists:member(options, Opts) of
@@ -455,7 +451,9 @@ compile_parsed_data(#pdata{mib_name = MibName,
     Deprecated = get_deprecated(Opts),
     RelChk = get_relaxed_row_name_assign_check(Opts),
     Data = #dldata{deprecated                    = Deprecated,
-		   relaxed_row_name_assign_check = RelChk}, 
+		   relaxed_row_name_assign_check = RelChk},
+    mc_new_type_loop(Definitions),
+    put(augmentations, false),
     definitions_loop(Definitions, Data),
     MibName.
 
@@ -480,7 +478,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}, 
@@ -744,32 +775,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,
@@ -1211,7 +1218,39 @@ definitions_loop([{Obj,Line}|T], Data) ->
 
 definitions_loop([], _Data) ->
     ?vlog("defloop -> done", []),
-    ok.
+    case get(augmentations) of
+        true ->
+            CData = get(cdata),
+            put(cdata, CData#cdata{mes = augmentations(CData#cdata.mes)}),
+            ok;
+        false ->
+            ok
+    end.
+
+augmentations(
+  [#me{
+      aliasname = AliasName,
+      assocList =
+          [{table_info,
+            #table_info{
+               index_types =
+                   {augments, SrcTableEntry, Line}} = TableInfo}|Ref]} = Me
+   |Mes]) ->
+    ?vlog("augmentations(~w) ->"
+          "~n   NameOfTable:  ~p"
+          "~n   IndexingInfo: ~p"
+          "~n   Sline:        ~p",
+          [?LINE, AliasName, {augments, SrcTableEntry}, Line]),
+    NewTableInfo = snmpc_lib:fix_table_info_augmentation(TableInfo),
+    [Me#me{assocList = [{table_info,NewTableInfo}|Ref]}
+     |augmentations(Mes)];
+augmentations([Me | Mes]) ->
+     [Me|augmentations(Mes)];
+augmentations([]) ->
+    ?vlog("augmentations -> done", []),
+    [].
+
+
 
 safe_elem(N,T) ->
     case catch(element(N,T)) of
diff --git a/lib/snmp/src/compile/snmpc_lib.erl b/lib/snmp/src/compile/snmpc_lib.erl
index 51690b6e7e..19a6bc8851 100644
--- a/lib/snmp/src/compile/snmpc_lib.erl
+++ b/lib/snmp/src/compile/snmpc_lib.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.
@@ -26,7 +26,7 @@
 -export([test_father/4, make_ASN1type/1, import/1, makeInternalNode2/2,
 	 is_consistent/1, resolve_defval/1, make_variable_info/1,
 	 check_trap_name/3, make_table_info/5, get_final_mib/2, set_dir/2,
-	 look_at/1, add_cdata/2,
+         fix_table_info_augmentation/1, look_at/1, add_cdata/2,
 	 check_object_group/4, check_notification_group/4, 
 	 check_notification/3, 
 	 register_oid/4,
@@ -99,7 +99,7 @@ make_ASN1type({{type_with_size,Type,{range,Lo,Hi}},Line}) ->
 	    print_error("Undefined type '~w'",[Type],Line),
 	    guess_string_type()
     end;
-make_ASN1type({{integer_with_enum,Type,Enums},Line}) ->
+make_ASN1type({{type_with_enum,Type,Enums},Line}) ->
     case lookup_vartype(Type) of
         {value,ASN1type} ->  ASN1type#asn1_type{assocList = [{enums, Enums}]};
 	false ->
@@ -710,25 +710,34 @@ check_trap_name(EnterpriseName, Line, MEs) ->
 %% functions for tables.
 %%----------------------------------------------------------------------
 
+fix_table_info_augmentation(
+  #table_info{index_types = {augments, SrcTableEntry, Line}} = TableInfo) ->
+    MEs = (get(cdata))#cdata.mes,
+    Aug =
+        case lookup(SrcTableEntry, MEs) of
+            false ->
+                print_error(
+                  "Cannot AUGMENT the non-existing table entry ~p",
+                  [SrcTableEntry], Line),
+                {augments, error};
+            {value, ME} ->
+                {augments,
+                 {SrcTableEntry, translate_type(ME#me.asn1_type)}}
+        end,
+    TableInfo#table_info{index_types = Aug}.
+
+
 make_table_info(Line, TableName, {augments, SrcTableEntry}, _, ColumnMEs) ->
     ColMEs = lists:keysort(#me.oid, ColumnMEs),
-    Nbr_of_Cols = length(ColMEs), 
-    MEs = ColMEs ++ (get(cdata))#cdata.mes,
-    Aug = case lookup(SrcTableEntry, MEs) of
-	      false ->
-		  print_error("Cannot AUGMENT the non-existing table entry ~p",
-			      [SrcTableEntry], Line),
-		  {augments, error};
-	      {value, ME} ->
-		  {augments, {SrcTableEntry, translate_type(ME#me.asn1_type)}}
-	  end,
-    FirstNonIdxCol = augments_first_non_index_column(ColMEs), 
+    Nbr_of_Cols = length(ColMEs),
+    put(augmentations, true),
+    FirstNonIdxCol = augments_first_non_index_column(ColMEs),
     NoAccs         = list_not_accessible(FirstNonIdxCol, ColMEs),
     FirstAcc       = first_accessible(TableName, ColMEs),
     #table_info{nbr_of_cols      = Nbr_of_Cols,
-		first_accessible = FirstAcc, 
-		not_accessible   = NoAccs, 
-		index_types      = Aug}; 
+		first_accessible = FirstAcc,
+		not_accessible   = NoAccs,
+		index_types      = {augments, SrcTableEntry, Line}};
 make_table_info(Line, TableName, {indexes, []}, _, _ColumnMEs) ->
     print_error("Table ~w lacks indexes.", [TableName],Line),
     #table_info{};
diff --git a/lib/snmp/src/compile/snmpc_mib_gram.yrl b/lib/snmp/src/compile/snmpc_mib_gram.yrl
index 743c3a6550..14a668127e 100644
--- a/lib/snmp/src/compile/snmpc_mib_gram.yrl
+++ b/lib/snmp/src/compile/snmpc_mib_gram.yrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. 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.
@@ -387,10 +387,12 @@ syntax -> type : {{type, cat('$1')},line_of('$1')}.
 syntax -> type size : {{type_with_size, cat('$1'), '$2'},line_of('$1')}.
 syntax -> usertype size : {{type_with_size,val('$1'), '$2'},line_of('$1')}.
 syntax -> 'INTEGER' '{' namedbits '}' : 
-          {{integer_with_enum, 'INTEGER', '$3'}, line_of('$1')}.
+          {{type_with_enum, 'INTEGER', '$3'}, line_of('$1')}.
 syntax -> 'BITS' '{' namedbits '}' : 
           ensure_ver(2,'$1'), 
           {{bits, '$3'}, line_of('$1')}.
+syntax -> usertype '{' namedbits '}' :
+          {{type_with_enum, 'INTEGER', '$3'}, line_of('$1')}.
 syntax -> 'SEQUENCE' 'OF' usertype : 
           {{sequence_of,val('$3')},line_of('$1')}.
 
diff --git a/lib/snmp/src/manager/snmpm_net_if.erl b/lib/snmp/src/manager/snmpm_net_if.erl
index 93c987eb0f..29216f9d6a 100644
--- a/lib/snmp/src/manager/snmpm_net_if.erl
+++ b/lib/snmp/src/manager/snmpm_net_if.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2015. All Rights Reserved.
+%% 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.
@@ -367,7 +367,7 @@ common_socket_opts(Opts) ->
 	     default ->
 		 [];
 	     Sz ->
-		 [{sndbuf, Sz}]
+		 [{recbuf, Sz}]
 	 end ++
 	 case get_opt(Opts, no_reuse, false) of
 	     false ->
diff --git a/lib/snmp/src/misc/snmp_log.erl b/lib/snmp/src/misc/snmp_log.erl
index 767d801eee..5713c14912 100644
--- a/lib/snmp/src/misc/snmp_log.erl
+++ b/lib/snmp/src/misc/snmp_log.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-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.
@@ -649,13 +649,14 @@ do_log_to_file(Log, TextFile, Mibs, Start, Stop) ->
             MiniMib = snmp_mini_mib:create(Mibs),
 	    Write = fun(X) -> 
 			    case format_msg(X, MiniMib, Start, Stop) of
-				{ok, S} ->
-				    io:format(Fd, "~s", [S]);
-				_ ->
-				    ok
+                                {Tag, S} when (Tag =:= ok) orelse (Tag =:= error) ->
+				    io:format(Fd, "~s", [S]),
+                                    Tag;
+				Ignore ->
+				    Ignore
 			    end
 		    end,
-            Res = (catch loop(disk_log:chunk(Log, start), Log, Write)),
+            Res = (catch loop(Log, Write)),
 	    snmp_mini_mib:delete(MiniMib), 
             file:close(Fd),
             Res;
@@ -668,39 +669,63 @@ do_log_to_io(Log, Mibs, Start, Stop) ->
     MiniMib = snmp_mini_mib:create(Mibs),
     Write = fun(X) -> 
 		    case format_msg(X, MiniMib, Start, Stop) of
-			{ok, S} ->
-			    io:format("~s", [S]);
-			_ ->
-			    ok
+			{Tag, S} when (Tag =:= ok) orelse (Tag =:= error) ->
+			    io:format("~s", [S]),
+                            Tag;
+			X ->
+			    X
 		    end
 	    end,
-    (catch loop(disk_log:chunk(Log, start), Log, Write)),
+    Res = (catch loop(Log, Write)),
     snmp_mini_mib:delete(MiniMib),
-    ok.
+    Res.
+
 
+loop(Log, Write) ->
+    loop(disk_log:chunk(Log, start), Log, Write, 0, 0).
 
-loop(eof, _Log, _Write) ->
+loop(eof, _Log, _Write, _NumOK, 0 = _NumERR) ->
     ok;
-loop({error, _} = Error, _Log, _Write) ->
+loop(eof, _Log, _Write, NumOK, NumERR) ->
+    {ok, {NumOK, NumERR}};
+loop({error, _} = Error, _Log, _Write, _NumOK, _NumERR) ->
     Error;
-loop({Cont, Terms}, Log, Write) ->
-    case (catch lists:foreach(Write, Terms)) of
-	{'EXIT', Reason} ->
-	    {error, Reason};
-	_ ->
-	    loop(disk_log:chunk(Log, Cont), Log, Write)
+loop({Cont, Terms}, Log, Write, NumOK, NumERR) ->
+    try loop_terms(Terms, Write) of
+        {ok, {AddedOK, AddedERR}} ->
+            loop(disk_log:chunk(Log, Cont), Log, Write,
+                 NumOK+AddedOK, NumERR+AddedERR)
+    catch
+        C:E:S ->
+            {error, {C, E, S}}
     end;
-loop({Cont, Terms, BadBytes}, Log, Write) ->
+loop({Cont, Terms, BadBytes}, Log, Write, NumOK, NumERR) ->
     error_logger:error_msg("Skipping ~w bytes while converting ~p~n~n", 
 			   [BadBytes, Log]),
-    case (catch lists:foreach(Write, Terms)) of
-	{'EXIT', Reason} ->
-	    {error, Reason};
-	_ ->
-	    loop(disk_log:chunk(Log, Cont), Log, Write)
-    end;
-loop(Error, _Log, _Write) ->
-    Error.
+    try loop_terms(Terms, Write) of
+        {ok, {AddedOK, AddedERR}} ->
+            loop(disk_log:chunk(Log, Cont), Log, Write,
+                 NumOK+AddedOK, NumERR+AddedERR)
+    catch
+        C:E:S ->
+            {error, {C, E, S}}
+    end.
+
+
+loop_terms(Terms, Write) ->
+    loop_terms(Terms, Write, 0, 0).
+
+loop_terms([], _Write, NumOK, NumERR) ->
+    {ok, {NumOK, NumERR}};
+loop_terms([Term|Terms], Write, NumOK, NumERR) ->
+    case Write(Term) of
+        ok ->
+            loop_terms(Terms, Write, NumOK+1, NumERR);
+        error ->
+            loop_terms(Terms, Write, NumOK,   NumERR+1);
+        _ ->
+            loop_terms(Terms, Write, NumOK,   NumERR)
+    end.
 
 
 format_msg(Entry, Mib, Start, Stop) ->
@@ -733,88 +758,149 @@ do_format_msg({Timestamp, SeqNo, Packet, Ip, Port}, Mib) ->
 
 %% This is crap...
 do_format_msg(_, _) ->
-    format_tab("** unknown entry in log file\n\n", []).
+    {error, format_tab("** unknown entry in log file\n\n", [])}.
 
 do_format_msg(TimeStamp, {V3Hdr, ScopedPdu}, AddrStr, Mib) ->
-    case (catch snmp_pdus:dec_scoped_pdu(ScopedPdu)) of
+    try snmp_pdus:dec_scoped_pdu(ScopedPdu) of
 	ScopedPDU when is_record(ScopedPDU, scopedPdu) -> 
 	    Msg = #message{version = 'version-3',
 			   vsn_hdr = V3Hdr,
 			   data    = ScopedPDU},
-	    f(ts2str(TimeStamp), "", Msg, AddrStr, Mib);
-	{'EXIT', Reason} ->
-	    format_tab(
-	      "** error in log file at ~s from ~s ~p\n\n",
-	      [ts2str(TimeStamp), AddrStr, Reason])
+	    try f(ts2str(TimeStamp), "", Msg, AddrStr, Mib) of
+                {ok, _} = OK ->
+                    OK
+            catch
+                FormatT:FormatE ->
+                    format_error("format scoped pdu",
+                                 TimeStamp, AddrStr, FormatT, FormatE)
+            end
+    catch
+        DecT:DecE ->
+            format_error("decode scoped pdu", 
+                         TimeStamp, AddrStr, DecT, DecE)
     end;
 do_format_msg(TimeStamp, Packet, AddrStr, Mib) ->
-    case (catch snmp_pdus:dec_message(binary_to_list(Packet))) of
+    try snmp_pdus:dec_message(binary_to_list(Packet)) of
 	Msg when is_record(Msg, message) ->
-	    f(ts2str(TimeStamp), "", Msg, AddrStr, Mib);
-	{'EXIT', Reason} ->
-	    format_tab("** error in log file ~p\n\n", [Reason])
+	    try f(ts2str(TimeStamp), "", Msg, AddrStr, Mib) of
+                {ok, _} = OK ->
+                    OK
+            catch
+                FormatT:FormatE ->
+                    %% Provide info about the message
+                    Extra = 
+                        case Msg#message.version of
+                            'version-3' ->
+                                #v3_hdr{msgID            = ID,
+                                        msgFlags         = Flags,
+                                        msgSecurityModel = SecModel} = 
+                                    Msg#message.vsn_hdr,
+                                SecLevel = snmp_misc:get_sec_level(Flags),
+                                f("msg-id: ~w, sec-level: ~w, sec-model: ~w", 
+                                  [ID, SecLevel, sm2atom(SecModel)]);
+                            _ -> %% Community
+                                f("community: ~s", [Msg#message.vsn_hdr])
+                        end,
+                    format_error(f("format ~p message; ~s", 
+                                   [Msg#message.version, Extra]),
+                                 TimeStamp, AddrStr, FormatT, FormatE)
+            end
+    catch
+        DecT:DecE ->
+            format_error("decode message", 
+                         TimeStamp, AddrStr, DecT, DecE)
+
     end.
-    
+
+sm2atom(?SEC_ANY) -> any;
+sm2atom(?SEC_V1)  -> v1;
+sm2atom(?SEC_V2C) -> v2c;
+sm2atom(?SEC_USM) -> usm;
+sm2atom(_)        -> unknown.
+
 do_format_msg(TimeStamp, SeqNo, {V3Hdr, ScopedPdu}, AddrStr, Mib) ->
-    case (catch snmp_pdus:dec_scoped_pdu(ScopedPdu)) of
+    try snmp_pdus:dec_scoped_pdu(ScopedPdu) of
 	ScopedPDU when is_record(ScopedPDU, scopedPdu) -> 
 	    Msg = #message{version = 'version-3',
 			   vsn_hdr = V3Hdr,
 			   data    = ScopedPDU},
-	    f(ts2str(TimeStamp), sn2str(SeqNo), Msg, AddrStr, Mib);
-	{'EXIT', Reason} ->
-	    format_tab(
-	      "** error in log file at ~s from ~s ~p\n\n",
-	      [ts2str(TimeStamp), sn2str(SeqNo), AddrStr, Reason])
+	    try f(ts2str(TimeStamp), sn2str(SeqNo), Msg, AddrStr, Mib) of
+                {ok, _} = OK ->
+                    OK
+            catch
+                FormatT:FormatE ->
+                    format_error("format scoped pdu",
+                                 TimeStamp, SeqNo, AddrStr, FormatT, FormatE)
+            end
+    catch
+        DecT:DecE ->
+            format_error("decode scoped pdu",
+                         TimeStamp, SeqNo, AddrStr, DecT, DecE)
     end;
 do_format_msg(TimeStamp, SeqNo, Packet, AddrStr, Mib) ->
-    case (catch snmp_pdus:dec_message(binary_to_list(Packet))) of
+    try snmp_pdus:dec_message(binary_to_list(Packet)) of
 	Msg when is_record(Msg, message) ->
-	    f(ts2str(TimeStamp), sn2str(SeqNo), Msg, AddrStr, Mib);
-	{'EXIT', Reason} ->
-	    format_tab(
-	      "** error in log file ~s from ~s ~p\n\n",
-	      [ts2str(TimeStamp), sn2str(SeqNo), AddrStr, Reason])
+	    try f(ts2str(TimeStamp), sn2str(SeqNo), Msg, AddrStr, Mib) of
+                {ok, _} = OK ->
+                    OK
+                        
+            catch
+                FormatT:FormatE ->
+                    %% Provide info about the message
+                    Extra = 
+                        case Msg#message.version of
+                            'version-3' ->
+                                #v3_hdr{msgID            = ID,
+                                        msgFlags         = Flags,
+                                        msgSecurityModel = SecModel} = 
+                                    Msg#message.vsn_hdr,
+                                SecLevel = snmp_misc:get_sec_level(Flags),
+                                f("msg-id: ~w, sec-level: ~w, sec-model: ~w", 
+                                  [ID, SecLevel, sm2atom(SecModel)]);
+                            _ -> %% Community
+                                f("community: ~s", [Msg#message.vsn_hdr])
+                        end,
+                    format_error(f("format ~p message; ~s", 
+                                   [Msg#message.version, Extra]),
+                                 TimeStamp, SeqNo, AddrStr, FormatT, FormatE)
+            end
+    catch
+        DecT:DecE ->
+            format_error("decode message",
+                         TimeStamp, SeqNo, AddrStr, DecT, DecE)
     end.
-    
-    
-%% format_msg({TimeStamp, {V3Hdr, ScopedPdu}, {Addr, Port}}, 
-%% 	   Mib, Start, Stop) ->
-%%     format_msg({TimeStamp, {V3Hdr, ScopedPdu}, Addr, Port}, 
-%% 	      Mib, Start, Stop);
-%% format_msg({TimeStamp, {V3Hdr, ScopedPdu}, Addr, Port}, 
-%% 	  Mib, Start, Stop) ->
-%%     case timestamp_filter(TimeStamp, Start, Stop) of
-%%         true ->
-%%             case (catch snmp_pdus:dec_scoped_pdu(ScopedPdu)) of
-%%                 ScopedPDU when record(ScopedPDU, scopedPdu) -> 
-%%                     Msg = #message{version = 'version-3',
-%%                                    vsn_hdr = V3Hdr,
-%%                                    data    = ScopedPDU},
-%%                     f(ts2str(TimeStamp), Msg, Addr, Port, Mib);
-%%                 {'EXIT', Reason} ->
-%%                     format_tab("** error in log file at ~s from ~p:~w ~p\n\n", 
-%% 			       [ts2str(TimeStamp), ip(Addr), Port, Reason])
-%%             end;
-%%         false ->
-%%             ignore
-%%     end;
-%% format_msg({TimeStamp, Packet, {Addr, Port}}, Mib, Start, Stop) -> 
-%%     format_msg({TimeStamp, Packet, Addr, Port}, Mib, Start, Stop);
-%% format_msg({TimeStamp, Packet, Addr, Port}, Mib, Start, Stop) ->
-%%     case timestamp_filter(TimeStamp, Start, Stop) of
-%%         true ->
-%%             case (catch snmp_pdus:dec_message(binary_to_list(Packet))) of
-%%                 Msg when record(Msg, message) ->
-%%                     f(ts2str(TimeStamp), Msg, Addr, Port, Mib);
-%%                 {'EXIT', Reason} ->
-%%                     format_tab("** error in log file ~p\n\n", [Reason])
-%%             end;
-%%         false ->
-%%             ignore
-%%     end;
-%% format_msg(_, _Mib, _Start, _Stop) ->
-%%     format_tab("** unknown entry in log file\n\n", []).
+
+
+format_error(WhatStr, TimeStamp, AddrStr, throw, {error, Reason}) ->
+    {ok, Str} = 
+        format_tab(
+          "** error (~s) in log file at ~s from ~s: "
+          "~n   ~p\n\n",
+          [WhatStr, ts2str(TimeStamp), AddrStr, Reason]),
+    {error, Str};
+format_error(WhatStr, TimeStamp, AddrStr, T, E) ->
+    {ok, Str} = 
+        format_tab(
+          "** error (~s) in log file at ~s from ~s: "
+          "~n   ~w: ~p\n\n",
+          [WhatStr, ts2str(TimeStamp), AddrStr, T, E]),
+    {error, Str}.
+
+format_error(WhatStr, TimeStamp, SeqNo, AddrStr, throw, {error, Reason}) ->
+    {ok, Str} = 
+        format_tab(
+          "** error (~s) in log file at ~s~s from ~s: "
+          "~n   ~p\n\n",
+          [WhatStr, ts2str(TimeStamp), sn2str(SeqNo), AddrStr, Reason]),        
+    {error, Str};
+format_error(WhatStr, TimeStamp, SeqNo, AddrStr, T, E) ->
+    {ok, Str} = 
+        format_tab(
+          "** error (~s) in log file at ~s~s from ~s: "
+          "~n   ~w, ~p\n\n",
+          [WhatStr, ts2str(TimeStamp), sn2str(SeqNo), AddrStr, T, E]),        
+    {error, Str}.
+
 
 f(TimeStamp, SeqNo, 
   #message{version = Vsn, vsn_hdr = VsnHdr, data = Data}, 
@@ -838,51 +924,21 @@ f(TimeStamp, SeqNo,
 	end,
     format_tab(
       "~w ~s - ~s [~s]~s ~w\n~s",
-      [Class, AddrStr, HdrStr, TimeStamp, SeqNo, Vsn, Str]).
-
-%% f(TimeStamp, SeqNo,
-%%   #message{version = Vsn, vsn_hdr = VsnHdr, data = Data},
-%%   Addr, Port, Mib) ->
-%%     Str    = format_pdu(Data, Mib),
-%%     HdrStr = format_header(Vsn, VsnHdr),
-%%     case get_type(Data) of
-%%         trappdu ->
-%%             f_trap(TimeStamp, SeqNo, Vsn, HdrStr, Str, Addr, Port);
-%%         'snmpv2-trap' ->
-%%             f_trap(TimeStamp, SeqNo, Vsn, HdrStr, Str, Addr, Port);
-%%         'inform-request' ->
-%%             f_inform(TimeStamp, SeqNo, Vsn, HdrStr, Str, Addr, Port);
-%%         'get-response' ->
-%%             f_response(TimeStamp, SeqNo, Vsn, HdrStr, Str, Addr, Port);
-%%         report ->
-%%             f_report(TimeStamp, SeqNo, Vsn, HdrStr, Str, Addr, Port);
-%%         _ ->
-%%             f_request(TimeStamp, SeqNo, Vsn, HdrStr, Str, Addr, Port)
-%%     end.
-
-%% f_request(TimeStamp, SeqNo, Vsn, HdrStr, Str, Addr, Port) ->
-%%     format_tab("request ~s:~w - ~s [~s]~s ~w\n~s",
-%% 	       [ip(Addr), Port, HdrStr, TimeStamp, SeqNo, Vsn, Str]).
-
-%% f_response(TimeStamp, SeqNo, Vsn, HdrStr, Str, Addr, Port) ->
-%%     format_tab("response ~s:~w - ~s [~s]~s ~w\n~s",
-%% 	       [ip(Addr), Port, HdrStr, TimeStamp, SeqNo, Vsn, Str]).
-
-%% f_report(TimeStamp, SeqNo, Vsn, HdrStr, Str, Addr, Port) ->
-%%     format_tab("report ~s:~w - ~s [~s]~s ~w\n~s",
-%% 	       [ip(Addr), Port, HdrStr, TimeStamp, SeqNo, Vsn, Str]).
+      [Class, AddrStr, HdrStr, TimeStamp, SeqNo, Vsn, Str]);
+f(TimeStamp, SeqNo, Msg, AddrStr, _Mib) ->
+    io:format("<ERROR> Unexpected data: "
+              "~n   TimeStamp: ~s~s"
+              "~n   Msg:       ~p"
+              "~n   AddrStr:   ~p"
+              "~n", [TimeStamp, SeqNo, Msg, AddrStr]),
+    throw({error, 'invalid-message'}).
 
-%% f_trap(TimeStamp, SeqNo, Vsn, HdrStr, Str, Addr, Port) ->
-%%     format_tab("trap ~s:~w - ~s [~s]~s ~w\n~s",
-%% 	       [ip(Addr), Port, HdrStr, TimeStamp, SeqNo, Vsn, Str]).
+f(F, A) ->
+    lists:flatten(io_lib:format(F, A)).
 
-%% f_inform(TimeStamp, SeqNo, Vsn, HdrStr, Str, Addr, Port) ->
-%%     format_tab("inform ~s:~w - ~s [~s]~s ~w\n~s",
-%% 	       [ip(Addr), Port, HdrStr, TimeStamp, SeqNo, Vsn, Str]).
 
 ipPort2Str(Ip, Port) ->
     snmp_conf:mk_addr_string({Ip, Port}).
-    %% io_lib:format("~s:~w", [ip(Ip), Port]).
 
 %% Convert a timestamp 2-tupple to a printable string
 %%
@@ -973,7 +1029,13 @@ format_pdu(#scopedPdu{contextName = Context, data = Pdu}, Mib) ->
     io_lib:format("Context: \"~s\"\n~s",
                   [Context, snmp_misc:format_pdu(Pdu, Mib)]);
 format_pdu(Pdu, Mib) ->
-    snmp_misc:format_pdu(Pdu, Mib).
+    try snmp_misc:format_pdu(Pdu, Mib) of
+        Str ->
+            Str
+    catch
+        _:_ ->
+            throw({error, 'invalid-pdu'})
+    end.
 
 get_type(#scopedPdu{data = Pdu}) ->
     get_type(Pdu);
@@ -983,12 +1045,6 @@ get_type(#pdu{type = Type}) ->
     Type.
 
 
-%% ip(Domain, Addr) ->
-%%     snmp_conf:mk_addr_string(Domain, Addr).
-%% ip({A,B,C,D}) ->
-%%     io_lib:format("~w.~w.~w.~w", [A,B,C,D]).
-
-
 
 %% -------------------------------------------------------------------    
 %% Various utility functions
diff --git a/lib/snmp/test/snmp_agent_test.erl b/lib/snmp/test/snmp_agent_test.erl
index 3c1a6f2afd..f9c18af6ea 100644
--- a/lib/snmp/test/snmp_agent_test.erl
+++ b/lib/snmp/test/snmp_agent_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-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.
@@ -605,7 +605,12 @@ init_per_group(multiple_reqs_3 = GroupName, Config) ->
 init_per_group(test_multi_threaded = GroupName, Config) -> 
     init_mt(snmp_test_lib:init_group_top_dir(GroupName, Config));
 init_per_group(test_v3 = GroupName, Config) -> 
-    init_v3(snmp_test_lib:init_group_top_dir(GroupName, Config));
+    case snmp_test_lib:crypto_start() of
+        ok ->
+            init_v3(snmp_test_lib:init_group_top_dir(GroupName, Config));
+        _ ->
+            {skip, "Crypto did not start"}
+    end;
 init_per_group(test_v1_v2 = GroupName, Config) -> 
     init_v1_v2(snmp_test_lib:init_group_top_dir(GroupName, Config));
 init_per_group(test_v2 = GroupName, Config) -> 
@@ -631,11 +636,26 @@ init_per_group(mib_storage_varm_dets = GroupName, Config) ->
     init_varm_mib_storage_dets(
       snmp_test_lib:init_group_top_dir(GroupName, Config));
 init_per_group(mib_storage_size_check_mnesia = GroupName, Config) -> 
-    init_size_check_msm(snmp_test_lib:init_group_top_dir(GroupName, Config));
+       case snmp_test_lib:crypto_start() of
+           ok ->
+               init_size_check_msm(snmp_test_lib:init_group_top_dir(GroupName, Config));
+           _ ->
+               {skip, "Crypto did not start"}
+       end;
 init_per_group(mib_storage_size_check_dets = GroupName, Config) -> 
-    init_size_check_msd(snmp_test_lib:init_group_top_dir(GroupName, Config));
+       case snmp_test_lib:crypto_start() of
+           ok ->
+               init_size_check_msm(snmp_test_lib:init_group_top_dir(GroupName, Config));
+           _ ->
+               {skip, "Crypto did not start"}
+       end;
 init_per_group(mib_storage_size_check_ets = GroupName, Config) -> 
-    init_size_check_mse(snmp_test_lib:init_group_top_dir(GroupName, Config));
+           case snmp_test_lib:crypto_start() of
+           ok ->
+               init_size_check_msm(snmp_test_lib:init_group_top_dir(GroupName, Config));
+           _ ->
+               {skip, "Crypto did not start"}
+       end;
 init_per_group(mib_storage_mnesia = GroupName, Config) -> 
     init_mib_storage_mnesia(snmp_test_lib:init_group_top_dir(GroupName, 
 							     Config));
diff --git a/lib/snmp/test/snmp_compiler_test.erl b/lib/snmp/test/snmp_compiler_test.erl
index 2c8851c2a7..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-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.
@@ -56,8 +56,10 @@
 	 otp_8574/1, 
 	 otp_8595/1, 
 	 otp_10799/1, 
-	 otp_10808/1
-
+	 otp_10808/1,
+	 otp_14145/1,
+         otp_13014/1,
+         otp_14196/1
 	]).
 
 %%----------------------------------------------------------------------
@@ -135,7 +137,9 @@ all() ->
     ].
 
 groups() -> 
-    [{tickets, [], [otp_6150, otp_8574, otp_8595, otp_10799, otp_10808]}].
+    [{tickets, [],
+      [otp_6150, otp_8574, otp_8595, otp_10799, otp_10808, otp_14145,
+       otp_13014, otp_14196]}].
 
 init_per_group(_GroupName, Config) ->
     Config.
@@ -431,6 +435,80 @@ otp_10808(Config) when is_list(Config) ->
 
 %%======================================================================
 
+otp_14145(suite) ->
+    [];
+otp_14145(Config) when is_list(Config) ->
+    put(tname, otp14145),
+    p("starting with Config: ~p~n", [Config]),
+
+    Dir     = ?config(case_top_dir, Config),
+    MibDir  = ?config(mib_dir,      Config),
+    MibName = "OTP14145-MIB",
+    MibFile = join(MibDir, MibName++".mib"),
+    ?line {ok, MibBin} =
+	snmpc:compile(MibFile, [{outdir, Dir},
+				{verbosity, trace},
+				{group_check, false},
+				module_compliance]),
+    p("Mib: ~n~p~n", [MibBin]),
+    MIB = read_mib(MibBin),
+    Oid = [1,3,6,1,2,1,67,4],
+    check_mib(MIB#mib.mes, Oid, undefined),
+    ok.
+
+
+%%======================================================================
+
+otp_13014(suite) ->
+    [];
+otp_13014(Config) when is_list(Config) ->
+    put(tname, otp13014),
+    p("starting with Config: ~p~n", [Config]),
+
+    Dir     = ?config(case_top_dir, Config),
+    MibDir  = ?config(mib_dir,      Config),
+    MibName = "Test-LLDP-MIB",
+    MibFile = join(MibDir, MibName++".mib"),
+    ?line {ok, MibBin} =
+	snmpc:compile(MibFile, [{outdir, Dir},
+				{verbosity, log},
+				{group_check, false},
+				module_compliance]),
+    p("Mib: ~n~p~n", [MibBin]),
+    #mib{mes = MEs} = read_mib(MibBin),
+    Oid = [1,0,8802,1,1,2,1,1,7],
+    #me{
+       entrytype = table,
+       aliasname = lldpConfigManAddrTable,
+       assocList = [{table_info,TableInfo}]} =
+        lists:keyfind(Oid, #me.oid, MEs),
+    #table_info{
+       nbr_of_cols = 1,
+       first_accessible = 1,
+       not_accessible = [],
+       index_types = {augments,{lldpLocManAddrEntry,undefined}}} =
+        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.
+
+
+%%======================================================================
+
 augments_extra_info(suite) ->
     [];
 augments_extra_info(Config) when is_list(Config) ->
diff --git a/lib/snmp/test/snmp_manager_test.erl b/lib/snmp/test/snmp_manager_test.erl
index 71f4017d8b..6ced55f0cc 100644
--- a/lib/snmp/test/snmp_manager_test.erl
+++ b/lib/snmp/test/snmp_manager_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2003-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.
@@ -156,16 +156,25 @@ init_per_suite(Config0) when is_list(Config0) ->
     ?DBG("init_per_suite -> entry with"
 	 "~n   Config0: ~p", [Config0]),
 
-    Config1   = snmp_test_lib:init_suite_top_dir(?MODULE, Config0), 
-    Config2   = snmp_test_lib:fix_data_dir(Config1),
-
-    %% Mib-dirs
-    %% data_dir is trashed by the test-server / common-test
-    %% so there is no point in fixing it...
-    MibDir    = snmp_test_lib:lookup(data_dir, Config2),
-    StdMibDir = filename:join([code:priv_dir(snmp), "mibs"]),
-
-    [{mib_dir, MibDir}, {std_mib_dir, StdMibDir} | Config2].
+    %% Preferably this test SUITE should be divided into groups
+    %% so that if crypto does not work only v3 tests that
+    %% need crypto will be skipped, but as this is only a
+    %% problem with one legacy test machine, we will procrastinate
+    %% until we have a more important reason to fix this. 
+    case snmp_test_lib:crypto_start() of
+        ok ->
+            Config1   = snmp_test_lib:init_suite_top_dir(?MODULE, Config0), 
+            Config2   = snmp_test_lib:fix_data_dir(Config1),
+            %% Mib-dirs
+            %% data_dir is trashed by the test-server / common-test
+            %% so there is no point in fixing it...
+            MibDir    = snmp_test_lib:lookup(data_dir, Config2),
+            StdMibDir = filename:join([code:priv_dir(snmp), "mibs"]),
+            
+            [{mib_dir, MibDir}, {std_mib_dir, StdMibDir} | Config2];
+        _ ->
+            {skip, "Crypto did not start"}
+    end.
 
 end_per_suite(Config) when is_list(Config) ->
 
@@ -1760,7 +1769,7 @@ do_simple_sync_get2(Node, TargetName, Oids, Get, PostVerify)
 	 "~n   Rem:   ~w", [Reply, _Rem]),
 
     %% verify that the operation actually worked:
-    %% The order should be the same, so no need to seach 
+    %% The order should be the same, so no need to search
     ?line ok = case Reply of
 		   {noError, 0, [#varbind{oid   = ?sysObjectID_instance,
 					  value = SysObjectID}, 
@@ -2709,7 +2718,7 @@ do_simple_set2(Node, TargetName, VAVs, Set, PostVerify) ->
 	 "~n   Rem:   ~w", [Reply, _Rem]),
 
     %% verify that the operation actually worked:
-    %% The order should be the same, so no need to seach 
+    %% The order should be the same, so no need to search
     %% The value we get should be exactly the same as we sent
     ?line ok = case Reply of
 		   {noError, 0, [#varbind{oid   = ?sysName_instance,
@@ -5118,10 +5127,10 @@ inform_swarm_collector(N) ->
 
 %% Note that we need to deal with re-transmissions!
 %% That is, the agent did not receive the ack in time,
-%% and therefor did a re-transmit. This means that we 
-%% expect to receive more inform's then we actually 
-%% sent. So for sucess we assume: 
-%% 
+%% and therefor did a re-transmit. This means that we
+%% expect to receive more inform's then we actually
+%% sent. So for success we assume:
+%%
 %%     SentAckCnt =  N
 %%     RespCnt    =  N
 %%     RecvCnt    >= N
diff --git a/lib/snmp/test/snmp_test_data/OTP14145-MIB.mib b/lib/snmp/test/snmp_test_data/OTP14145-MIB.mib
new file mode 100644
index 0000000000..f29c65c4c2
--- /dev/null
+++ b/lib/snmp/test/snmp_test_data/OTP14145-MIB.mib
@@ -0,0 +1,44 @@
+OTP14145-MIB DEFINITIONS ::= BEGIN
+
+IMPORTS
+       MODULE-IDENTITY, OBJECT-TYPE,
+       mib-2      FROM SNMPv2-SMI
+       InetAddressType, InetAddress     FROM INET-ADDRESS-MIB
+       MODULE-COMPLIANCE, OBJECT-GROUP  FROM SNMPv2-CONF;
+
+testMibId MODULE-IDENTITY
+       LAST-UPDATED "200608210000Z"  -- 21 August 2006
+       ORGANIZATION "a"
+       CONTACT-INFO "a"
+       DESCRIPTION "a"
+       REVISION "200608210000Z"  -- 21 August 2006
+       DESCRIPTION "a"
+       ::= { mib-2 67 }
+
+testObj OBJECT-TYPE
+       SYNTAX InetAddressType
+       -- SYNTAX InetAddress
+       MAX-ACCESS read-only
+       STATUS current
+       DESCRIPTION "a"
+       ::= { testMibId 2 }
+
+testObjId OBJECT IDENTIFIER ::= { testMibId 3 }
+
+testMibCompliance MODULE-COMPLIANCE
+            STATUS  current
+            DESCRIPTION "a"
+            MODULE
+            OBJECT testObj
+            SYNTAX InetAddressType { ipv4(1), ipv6(2) }
+            -- SYNTAX InetAddress ( SIZE(4|16) )
+            DESCRIPTION "a"
+            ::= { testMibId 4 }
+
+testObjGroup OBJECT-GROUP
+  OBJECTS { testObj }
+  STATUS current
+  DESCRIPTION "a"
+  ::= { testObjId 1 }
+
+END
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/test/snmp_test_data/Test-LLDP-MIB.mib b/lib/snmp/test/snmp_test_data/Test-LLDP-MIB.mib
new file mode 100644
index 0000000000..40a9fc79e1
--- /dev/null
+++ b/lib/snmp/test/snmp_test_data/Test-LLDP-MIB.mib
@@ -0,0 +1,251 @@
+Test-LLDP-MIB DEFINITIONS ::= BEGIN
+
+IMPORTS
+    MODULE-IDENTITY, OBJECT-TYPE, Integer32, Counter32, NOTIFICATION-TYPE
+        FROM SNMPv2-SMI
+    TEXTUAL-CONVENTION, TimeStamp, TruthValue
+        FROM SNMPv2-TC
+    SnmpAdminString
+        FROM SNMP-FRAMEWORK-MIB
+    MODULE-COMPLIANCE, OBJECT-GROUP, NOTIFICATION-GROUP
+        FROM SNMPv2-CONF;
+
+t-lldpMIB MODULE-IDENTITY
+    LAST-UPDATED "200505060000Z" -- May 06, 2005
+    ORGANIZATION "IEEE 802.1 Working Group"
+    CONTACT-INFO
+            " Contact: The Erlang/OTP team at Ericsson AB, Sweden
+
+               WG-URL: http://grouper.ieee.org/groups/802/1/index.html
+             WG-EMail: [email protected]
+
+              Contact: Paul Congdon
+               Postal: Hewlett-Packard Company
+                       8000 Foothills Blvd.
+                       Roseville, CA 95747
+                       USA
+                  Tel: +1-916-785-5753
+               E-mail: [email protected]"
+    DESCRIPTION
+            "This is the ripped out bits and pieces of LLDP-MIB
+            that triggered a compilation problem for Erlang/OTP's
+            MIB compiler due to an AUGMENTS in lldpConfigManAddrEntry
+            refering to a not yet defined OBJECT-TYPE lldpLocManAddrEntry.
+	    Rip and rewrite done 2017.
+
+             Management Information Base module for LLDP configuration,
+            statistics, local system data and remote systems data
+            components.
+
+            Copyright (C) IEEE (2005).  This version of this MIB module
+            is published as subclause 12.1 of IEEE Std 802.1AB-2005;
+            see the standard itself for full legal notices."
+    REVISION        "200505060000Z" -- May 06, 2005
+    DESCRIPTION
+            "Published as part of IEEE Std 802.1AB-2005 initial version."
+   ::= { iso std(0) iso8802(8802) ieee802dot1(1) ieee802dot1mibs(1) 2 }
+
+--lldpNotifications            OBJECT IDENTIFIER ::= { lldpMIB 0 }
+lldpObjects                  OBJECT IDENTIFIER ::= { t-lldpMIB 1 }
+lldpConformance              OBJECT IDENTIFIER ::= { t-lldpMIB 2 }
+
+--
+-- LLDP MIB Objects
+--
+
+lldpConfiguration            OBJECT IDENTIFIER ::= { lldpObjects 1 }
+--lldpStatistics               OBJECT IDENTIFIER ::= { lldpObjects 2 }
+lldpLocalSystemData          OBJECT IDENTIFIER ::= { lldpObjects 3 }
+--lldpRemoteSystemsData        OBJECT IDENTIFIER ::= { lldpObjects 4 }
+--lldpExtensions               OBJECT IDENTIFIER ::= { lldpObjects 5 }
+
+
+
+LldpPortList ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+            "Each octet within this value specifies a set of eight ports,
+            with the first octet specifying ports 1 through 8, the second
+            octet specifying ports 9 through 16, etc.  Within each octet,
+            the most significant bit represents the lowest numbered port,
+            and the least significant bit represents the highest numbered
+            port.  Thus, each port of the system is represented by a
+            single bit within the value of this object.  If that bit has
+            a value of '1' then that port is included in the set of ports;
+            the port is not included if its bit has a value of '0'."
+    REFERENCE
+            "IETF RFC 2674 section 5"
+    SYNTAX  OCTET STRING(SIZE(0..512))
+
+
+
+--
+-- lldpManAddrConfigTxPortsTable : selection of management addresses
+--                                 to be transmitted on a specified set
+--                                 of ports.
+--
+
+lldpConfigManAddrTable OBJECT-TYPE
+    SYNTAX      SEQUENCE OF LldpConfigManAddrEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION
+            "The table that controls selection of LLDP management address
+            TLV instances to be transmitted on individual ports."
+    ::= { lldpConfiguration 7 }
+
+lldpConfigManAddrEntry  OBJECT-TYPE
+    SYNTAX      LldpConfigManAddrEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION
+            "LLDP configuration information that specifies the set
+            of ports (represented as a PortList) on which the local
+            system management address instance will be transmitted.
+
+            This configuration object augments the lldpLocManAddrEntry,
+            therefore it is only present along with the management
+            address instance contained in the associated
+            lldpLocManAddrEntry entry.
+
+            Each active lldpConfigManAddrEntry must be restored from
+            non-volatile and re-created (along with the corresponding
+            lldpLocManAddrEntry) after a re-initialization of the
+            management system."
+    AUGMENTS { lldpLocManAddrEntry }
+    ::= { lldpConfigManAddrTable 1 }
+
+LldpConfigManAddrEntry  ::= SEQUENCE {
+    lldpConfigManAddrPortsTxEnable LldpPortList
+}
+
+lldpConfigManAddrPortsTxEnable  OBJECT-TYPE
+    SYNTAX        LldpPortList
+    MAX-ACCESS    read-write
+    STATUS        current
+    DESCRIPTION
+            "A set of ports that are identified by a PortList, in which
+            each port is represented as a bit.  The corresponding local
+            system management address instance will be transmitted on the
+            member ports of the lldpManAddrPortsTxEnable.
+
+            The default value for lldpConfigManAddrPortsTxEnable object
+            is empty binary string, which means no ports are specified
+            for advertising indicated management address instance."
+    REFERENCE
+            "IEEE 802.1AB-2005 10.2.1.1"
+    DEFVAL  { ''H }     -- empty binary string
+    ::= { lldpConfigManAddrEntry 1 }
+
+
+--
+-- lldpLocManAddrTable : Management addresses of the local system
+--
+
+lldpLocManAddrTable OBJECT-TYPE
+    SYNTAX      SEQUENCE OF LldpLocManAddrEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION
+            "This table contains management address information on the
+            local system known to this agent."
+    ::= { lldpLocalSystemData 8 }
+
+lldpLocManAddrEntry OBJECT-TYPE
+    SYNTAX      LldpLocManAddrEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION
+            "Management address information about a particular chassis
+            component.  There may be multiple management addresses
+            configured on the system identified by a particular
+            lldpLocChassisId.  Each management address should have
+            distinct 'management address type' (lldpLocManAddrSubtype) and
+            'management address' (lldpLocManAddr.)
+
+            Entries may be created and deleted in this table by the
+            agent."
+    INDEX   { lldpLocManAddrIfId,
+              lldpLocManAddrLen }
+    ::= { lldpLocManAddrTable 1 }
+
+LldpLocManAddrEntry ::= SEQUENCE {
+      lldpLocManAddrIfId       Integer32,
+      lldpLocManAddrLen        Integer32,
+      lldpLocManAddrOID        OBJECT IDENTIFIER
+}
+
+lldpLocManAddrIfId  OBJECT-TYPE
+    SYNTAX      Integer32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+            "The integer value used to identify the interface number
+            regarding the management address component associated with
+            the local system."
+    REFERENCE
+            "IEEE 802.1AB-2005 9.5.9.6"
+    ::= { lldpLocManAddrEntry 1 }
+
+lldpLocManAddrLen  OBJECT-TYPE
+    SYNTAX      Integer32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+            "The total length of the management address subtype and the
+            management address fields in LLDPDUs transmitted by the
+            local LLDP agent.
+
+            The management address length field is needed so that the
+            receiving systems that do not implement SNMP will not be
+            required to implement an iana family numbers/address length
+            equivalency table in order to decode the management adress."
+    REFERENCE
+            "IEEE 802.1AB-2005 9.5.9.2"
+    ::= { lldpLocManAddrEntry 2 }
+
+lldpLocManAddrOID  OBJECT-TYPE
+    SYNTAX      OBJECT IDENTIFIER
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+            "The OID value used to identify the type of hardware component
+            or protocol entity associated with the management address
+            advertised by the local system agent."
+    REFERENCE
+            "IEEE 802.1AB-2005 9.5.9.8"
+    ::= { lldpLocManAddrEntry 3 }
+
+
+lldpGroups      OBJECT IDENTIFIER ::= { lldpConformance 1 }
+
+lldpLocSysGroup  OBJECT-GROUP
+    OBJECTS {
+        lldpLocManAddrIfId,
+        lldpLocManAddrLen,
+        lldpLocManAddrOID
+    }
+    STATUS  current
+    DESCRIPTION
+            "The collection of objects which are used to represent LLDP
+            Local System Information.
+
+            This group is mandatory for agents which implement the LLDP
+            and have the capability of transmitting LLDP frames."
+    ::= { lldpGroups 6 }
+
+lldpConfigTxGroup    OBJECT-GROUP
+    OBJECTS {
+        lldpConfigManAddrPortsTxEnable
+    }
+    STATUS  current
+    DESCRIPTION
+            "The collection of objects which are used to configure the
+            LLDP implementation behavior.
+
+            This group is mandatory for agents which implement the LLDP
+            and have the capability of transmitting LLDP frames."
+    ::= { lldpGroups 3 }
+
+
+END
diff --git a/lib/snmp/test/snmp_to_snmpnet_SUITE.erl b/lib/snmp/test/snmp_to_snmpnet_SUITE.erl
index 24c14d86ea..b83c7461d1 100644
--- a/lib/snmp/test/snmp_to_snmpnet_SUITE.erl
+++ b/lib/snmp/test/snmp_to_snmpnet_SUITE.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.
@@ -88,8 +88,17 @@ groups() ->
     ].
 
 init_per_suite(Config) ->
-    [{agent_port, ?AGENT_PORT}, {manager_port, ?MANAGER_PORT} | Config].
-    
+    case re:run(os:cmd("snmpd -v"),"NET-SNMP", [{capture, first}]) of
+        nomatch ->
+            {skip, "snmpd is NOT NET-SNMP"};
+        {match, _} ->
+            case re:run(os:cmd("snmpd -v"),"5.4|5.6.2.1", [{capture, first}]) of
+                nomatch ->
+                    [{agent_port, ?AGENT_PORT}, {manager_port, ?MANAGER_PORT} | Config];
+                {match, _} ->
+                    {skip, "buggy snmpd"}
+            end
+    end.
 end_per_suite(_Config) ->
     ok.
 
@@ -322,7 +331,7 @@ snmpget(Oid, Transport, Config) ->
 
     Args =
 	["-c", "public", net_snmp_version(Versions),
-	 "-m", "",
+	 "-m", ":",
 	 "-Cf",
 	 net_snmp_addr_str(Transport),
 	 oid_str(Oid)],
@@ -353,11 +362,13 @@ start_snmpd(Community, SysDescr, Config) ->
 	["--rocommunity"++domain_suffix(Domain)++"="
 	 ++Community++" "++inet_parse:ntoa(Ip)
 	 || {Domain, {Ip, _}} <- Targets],
+
     SnmpdArgs =
-	["-f", "-r", %"-Dverbose",
-	 "-c", filename:join(DataDir, "snmpd.conf"),
-	 "-C", "-Lo",
-	 "-m", "",
+        ["-f", "-r", %"-Dverbose",
+         "-c", filename:join(DataDir, "snmpd.conf"),
+         "-C",
+         "-Lo",
+	 "-m", ":",
 	 "--sysDescr="++SysDescr,
 	 "--agentXSocket=tcp:localhost:"++integer_to_list(Port)]
 	++ CommunityArgs
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index 28eba0d0d6..4d5a0fbce8 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -2,7 +2,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.
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = snmp
-SNMP_VSN    = 5.2.4
+SNMP_VSN    = 5.2.12
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(SNMP_VSN)$(PRE_VSN)"