diff --git a/.travis.yml b/.travis.yml
index 100abe9e0..b210c83a2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,30 +1,49 @@
 language: c
-sudo: required
-dist: trusty
-install:
-- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update; fi
-- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
-# install build tools
-- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install automake autoconf libtool; fi
-- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install libtool pkg-config; fi
-# install libxml2/libxslt libraries
-- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install libxml2 libxml2-dev libxslt1.1 libxslt1-dev; fi
-# install openssl libraries
-- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install libssl1.0.0 libssl-dev; fi
-- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install openssl; fi
-# install nspr/nss libraries
-- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install libnspr4 libnspr4-dev libnss3 libnss3-dev libnss3-tools; fi
-- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install nss; fi
-# install gcrypt libraries
-- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install libgcrypt11 libgcrypt11-dev; fi
-# install gnutls libraries
-- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install libgnutls28 libgnutls-dev; fi
+os: linux
+dist: bionic
+
+addons:
+  apt:
+    packages:
+    - automake
+    - autoconf
+    - libtool
+    - libtool-bin
+    - libltdl-dev
+    - libltdl7
+    - libxml2
+    - libxml2-dev
+    - libxslt1.1
+    - libxslt1-dev
+    - libssl1.0.0
+    - libssl-dev
+    - libnspr4
+    - libnspr4-dev
+    - libnss3
+    - libnss3-dev
+    - libnss3-tools
+    - libgcrypt20
+    - libgcrypt20-dev
+    - libgnutls28-dev
+  homebrew:
+    packages:
+    - libtool
+    - openssl
+    - nss
+    - libgcrypt
+    - gnutls
+    
 script:
 - . scripts/travis-env.sh && mkdir build && cd build && ../autogen.sh --enable-werror && make && make check
-matrix:
+
+jobs:
   include:
-  - name: "linux"
+  - name: "linux-x86_64"
     os: linux
+    arch: amd64
   - name: "osx"
     os: osx
     osx_image: xcode9.3
+  - name: "linux-s390x"
+    os: linux
+    arch: s390x
diff --git a/INSTALL b/INSTALL
index baa984f47..a585a07a0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,7 @@
 Compilation
 
 1. How to compile XMLSec?
+
 As most UNIX libraries XMLSec follows the "standard":
 
      gunzip -c xmlsec-xxx.tar.gz | tar xvf -
@@ -19,6 +20,14 @@ that the library is compiled successfully by running
 
      make check
 
+Alternatively there are several community maintained ports to CMake
+build system:
+
+* https://github.com/vmiklos/odfsig/tree/master/extern/xmlsec
+
+* https://github.com/microsoft/vcpkg/tree/master/ports/xmlsec
+
+
 2.What other libraries are needed to compile/install XMLSec? 
 XMLSec requires following libraries:
 
diff --git a/appveyor.yml b/appveyor.yml
index 4d956a1ae..00d15e2cf 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,7 +12,7 @@
 # You can check the whole build process in the logs, and any later commit will start
 # a new build using a fresh virtual machine.
 
-version: '1.2.29-{build}'
+version: '1.2.30-{build}'
 
 shallow_clone: true
 skip_branch_with_pr: true
diff --git a/autogen.sh b/autogen.sh
index fe00bb356..5d2d4a891 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -36,6 +36,11 @@ fi
 	echo "You must have autoconf installed to compile xmlsec."
 	DIE=1
 }
+(autoreconf --version) < /dev/null > /dev/null 2>&1 || {
+        echo
+        echo "You must have autoreconf installed to compile xmlsec."
+        DIE=1
+}
 (automake --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have automake installed to compile xmlsec."
@@ -76,6 +81,8 @@ echo "Running automake..."
 automake --gnu --add-missing
 echo "Running autoconf..."
 autoconf
+echo "Running autoreconf..."
+autoreconf -i
 
 cd $THEDIR
 
diff --git a/configure.ac b/configure.ac
index e2f6393d3..6dd4a8f8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([xmlsec1],[1.2.29],[http://www.aleksey.com/xmlsec])
+AC_INIT([xmlsec1],[1.2.30],[http://www.aleksey.com/xmlsec])
 
 XMLSEC_PACKAGE=xmlsec1
 XMLSEC_VERSION_MAJOR=1
 XMLSEC_VERSION_MINOR=2
-XMLSEC_VERSION_SUBMINOR=29
+XMLSEC_VERSION_SUBMINOR=30
 XMLSEC_VERSION="$XMLSEC_VERSION_MAJOR.$XMLSEC_VERSION_MINOR.$XMLSEC_VERSION_SUBMINOR"
 XMLSEC_VERSION_INFO=`echo $XMLSEC_VERSION | awk -F. '{ printf "%d:%d:%d", $1+$2, $3, $2 }'`
 XMLSEC_VERSION_SAFE=`echo $XMLSEC_VERSION | sed 's/\./_/g'`
@@ -315,7 +315,7 @@ if test "z$LIBXML_FOUND" = "zno" -a "z$with_libxml" != "z" -a "z$with_libxml" !=
         AC_MSG_RESULT([yes])
     elif test [ -f "$with_libxml/include/libxml2/$LIBXML_INCLUDE_MARKER" ] -a [ -f "$with_libxml/lib/$LIBXML_SHARED_LIB_MARKER" -o -f "$with_libxml/lib/$LIBXML_STATIC_LIB_MARKER" ] ; then
         LIBXML_INCLUDE_PATH="$with_libxml/include/libxml2"
-        LIBXSLT_LIB_PATH="$with_libxml/lib"
+        LIBXML_LIB_PATH="$with_libxml/lib"
         LIBXML_FOUND="yes"
         AC_MSG_RESULT([yes])
     else
diff --git a/docs/Makefile.am b/docs/Makefile.am
index a89ba76c3..4b196026e 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -27,9 +27,9 @@ docs-copy:
 		if [ z"$(srcdir)" != z"$(builddir)" -a z"`uname`" != z"Darwin" ]; \
 		then \
 		    $(CP) -ru $(srcdir)/*.html $(srcdir)/*.ico $(srcdir)/images $(builddir)/  ; \
-		    chmod u+w $(builddir)/*.html ; \
-		    chmod u+w $(builddir)/*.ico ; \
-		    chmod -R u+w $(builddir)/images ; \
+		    (chmod u+w $(builddir)/*.html || true) ; \
+		    (chmod u+w $(builddir)/*.ico || true) ; \
+		    (chmod -R u+w $(builddir)/images || true) ; \
 		fi \
 	)
 
@@ -94,8 +94,8 @@ endif
 clean-local:
 	-rm -f *.stamp
 	( if [ z"$(srcdir)" != z"$(builddir)" ] ; then \
-		chmod -R u+w $(builddir)/images && rm -rf $(builddir)/images ; \
-		chmod -R u+w $(builddir)/src && rm -rf $(builddir)/src ; \
+		(chmod -R u+w $(builddir)/images || true) && rm -rf $(builddir)/images ; \
+		(chmod -R u+w $(builddir)/src || true) && rm -rf $(builddir)/src ; \
 		(for i in `find $(builddir) -name "*.html" -print` ; do \
 			echo "Removing files '$$i' ... " ; \
 			chmod -R u+w $$i && rm -f $$i ; \
diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
index a1ffd3a73..dcf093d12 100644
--- a/docs/api/Makefile.am
+++ b/docs/api/Makefile.am
@@ -268,9 +268,9 @@ clean-local:
 	-rm -rf $(SOURCE_CODE_DIR) $(EXAMPLES_DIR) $(SCAN_DIR)/*.txt $(SGML_DIR) $(GTKDOC_MKDB_OUTPUT_DIR)
 	-rm -f *.stamp *.types index.sgml
 	@( if [ z"$(builddir)" != z"$(srcdir)" ] ; then \
-    	chmod -R u+w $(builddir)/src && rm -rf $(builddir)/src ; \
-    	chmod -R u+w $(builddir)/images && rm -rf $(builddir)/images ; \
-    	chmod -R u+w $(builddir)/*.png && rm -rf $(builddir)/*.png ; \
+    	(chmod -R u+w $(builddir)/src || true) && rm -rf $(builddir)/src ; \
+    	(chmod -R u+w $(builddir)/images || true) && rm -rf $(builddir)/images ; \
+    	(chmod -R u+w $(builddir)/*.png || true) && rm -rf $(builddir)/*.png ; \
 	 fi ; )
 
 distclean-local: clean-local
diff --git a/docs/api/xmlsec-index.html b/docs/api/xmlsec-index.html
index 6eb125bcd..400621309 100644
--- a/docs/api/xmlsec-index.html
+++ b/docs/api/xmlsec-index.html
@@ -1352,6 +1352,7 @@
 <li class="listitem"><p><a class="link" href="xmlsec-parser.html#xmlSecParseFile" title="xmlSecParseFile ()">xmlSecParseFile</a></p></li>
 <li class="listitem"><p><a class="link" href="xmlsec-parser.html#xmlSecParseMemoryExt" title="xmlSecParseMemoryExt ()">xmlSecParseMemoryExt</a></p></li>
 <li class="listitem"><p><a class="link" href="xmlsec-parser.html#xmlSecParseMemory" title="xmlSecParseMemory ()">xmlSecParseMemory</a></p></li>
+<li class="listitem"><p><a class="link" href="xmlsec-parser.html#xmlSecParsePrepareCtxt" title="xmlSecParsePrepareCtxt ()">xmlSecParsePrepareCtxt</a></p></li>
 <li class="listitem"><p><a class="link" href="xmlsec-xmltree.html#xmlSecPrintXmlString" title="xmlSecPrintXmlString ()">xmlSecPrintXmlString</a></p></li>
 <li class="listitem"><p><a class="link" href="xmlsec-list.html#xmlSecPtrDebugDumpItemMethod" title="xmlSecPtrDebugDumpItemMethod ()">xmlSecPtrDebugDumpItemMethod</a></p></li>
 <li class="listitem"><p><a class="link" href="xmlsec-list.html#xmlSecPtrDestroyItemMethod" title="xmlSecPtrDestroyItemMethod ()">xmlSecPtrDestroyItemMethod</a></p></li>
diff --git a/docs/api/xmlsec-parser.html b/docs/api/xmlsec-parser.html
index 1f094838c..0f17c7810 100644
--- a/docs/api/xmlsec-parser.html
+++ b/docs/api/xmlsec-parser.html
@@ -69,6 +69,14 @@ <h2><span class="refentrytitle"><a name="xmlsec-parser.top_of_page"></a>parser</
 </tr>
 <tr>
 <td class="function_type">
+<font><span class="returnvalue">void</span></font>
+</td>
+<td class="function_name">
+<a class="link" href="xmlsec-parser.html#xmlSecParsePrepareCtxt" title="xmlSecParsePrepareCtxt ()">xmlSecParsePrepareCtxt</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
 <font><span class="returnvalue">xmlSecTransformId</span></font>
 </td>
 <td class="function_name">
@@ -228,6 +236,28 @@ <h2><span class="refentrytitle"><a name="xmlsec-parser.top_of_page"></a>parser</
 </div>
 <hr>
 <div class="refsect2">
+<a name="xmlSecParsePrepareCtxt"></a><h3>xmlSecParsePrepareCtxt ()</h3>
+<pre class="programlisting"><font><span class="returnvalue">void</span></font>
+xmlSecParsePrepareCtxt (<em class="parameter"><code><font><span class="type">xmlParserCtxtPtr</span></font> ctxt</code></em>);</pre>
+<p>Prepares parser context for parsing XML for XMLSec.</p>
+<div class="refsect3">
+<a name="xmlSecParsePrepareCtxt.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col>
+<col>
+<col>
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>ctxt</p></td>
+<td class="parameter_description"><p>the parser context</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
 <a name="xmlSecTransformXmlParserGetKlass"></a><h3>xmlSecTransformXmlParserGetKlass ()</h3>
 <pre class="programlisting"><font><span class="returnvalue">xmlSecTransformId</span></font>
 xmlSecTransformXmlParserGetKlass (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
diff --git a/docs/api/xmlsec-version.html b/docs/api/xmlsec-version.html
index d669ce78a..915f5f44e 100644
--- a/docs/api/xmlsec-version.html
+++ b/docs/api/xmlsec-version.html
@@ -78,7 +78,7 @@ <h2><span class="refentrytitle"><a name="xmlsec-version.top_of_page"></a>version
 <a name="xmlsec-version.other_details"></a><h2>Types and Values</h2>
 <div class="refsect2">
 <a name="XMLSEC-VERSION:CAPS"></a><h3>XMLSEC_VERSION</h3>
-<pre class="programlisting">#define XMLSEC_VERSION			"1.2.29"
+<pre class="programlisting">#define XMLSEC_VERSION			"1.2.30"
 </pre>
 <p>The library version string in the format
 "$major_number.$minor_number.$sub_minor_number".</p>
@@ -100,14 +100,14 @@ <h2><span class="refentrytitle"><a name="xmlsec-version.top_of_page"></a>version
 <hr>
 <div class="refsect2">
 <a name="XMLSEC-VERSION-SUBMINOR:CAPS"></a><h3>XMLSEC_VERSION_SUBMINOR</h3>
-<pre class="programlisting">#define XMLSEC_VERSION_SUBMINOR		29
+<pre class="programlisting">#define XMLSEC_VERSION_SUBMINOR		30
 </pre>
 <p>The library sub-minor version number.</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="XMLSEC-VERSION-INFO:CAPS"></a><h3>XMLSEC_VERSION_INFO</h3>
-<pre class="programlisting">#define XMLSEC_VERSION_INFO		"3:29:2"
+<pre class="programlisting">#define XMLSEC_VERSION_INFO		"3:30:2"
 </pre>
 <p>The library version info string in the format
 "$major_number+$minor_number:$sub_minor_number:$minor_number".</p>
diff --git a/docs/api/xmlsec.devhelp2 b/docs/api/xmlsec.devhelp2
index cfffbeb66..7c3a47c0e 100644
--- a/docs/api/xmlsec.devhelp2
+++ b/docs/api/xmlsec.devhelp2
@@ -681,6 +681,7 @@
     <keyword type="function" name="xmlSecParseFile ()" link="xmlsec-parser.html#xmlSecParseFile"/>
     <keyword type="function" name="xmlSecParseMemory ()" link="xmlsec-parser.html#xmlSecParseMemory"/>
     <keyword type="function" name="xmlSecParseMemoryExt ()" link="xmlsec-parser.html#xmlSecParseMemoryExt"/>
+    <keyword type="function" name="xmlSecParsePrepareCtxt ()" link="xmlsec-parser.html#xmlSecParsePrepareCtxt"/>
     <keyword type="function" name="xmlSecTransformXmlParserGetKlass ()" link="xmlsec-parser.html#xmlSecTransformXmlParserGetKlass"/>
     <keyword type="macro" name="xmlSecTransformXmlParserId" link="xmlsec-parser.html#xmlSecTransformXmlParserId"/>
     <keyword type="function" name="xmlSecTmplSignatureCreate ()" link="xmlsec-templates.html#xmlSecTmplSignatureCreate"/>
diff --git a/docs/download.html b/docs/download.html
index 9d4effe10..4c3e2263d 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -420,10 +420,10 @@
       <h1>Download</h1>
       </div>
 <h2>Stable releases.</h2>
-<p>The latest stable XML Security Library version is <b>1.2.29</b>:</p>
+<p>The latest stable XML Security Library version is <b>1.2.30</b>:</p>
 <ul>
 <li>
-<a href="http://www.aleksey.com/xmlsec/download/xmlsec1-1.2.29.tar.gz">Sources for latest version</a>.</li>
+<a href="http://www.aleksey.com/xmlsec/download/xmlsec1-1.2.30.tar.gz">Sources for latest version</a>.</li>
 <li>
 <a href="http://www.zlatkovic.com/projects/libxml/index.html">Windows binaries</a> for XMLSec Library 
 (as well as LibXML2, LibXSLT and OpenSSL) from <a href="mailto:igor@zlatkovic.com">Igor Zlatkovic</a>.</li>
@@ -461,6 +461,11 @@ <h2>Installation (source archive)</h2>
 <h2>GIT</h2>
 <p>XML Security Library is available from the <a href="https://github.com/lsh123/xmlsec">GitHub</a>.
 </p>
+<h2>Other languages</h2>
+<p><ul>
+    <li><a href="https://github.com/mehcode/python-xmlsec">Python xmlsec module</a></li>
+    <li><a href="https://github.com/estrelow/Perl-LibXML-Sec">Perl LibXML-Sec module</a></li>
+</ul></p>
 </td></tr></table></td>
 </tr></table></body>
 </html>
diff --git a/docs/index.html b/docs/index.html
index 2e8ec715c..150b5320d 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -439,7 +439,15 @@ <h1>XML Security Library</h1>
 see the Copyright file in the distribution  for details.<br><br></p>
 <p><b>News</b></p>
 <ul>
-<li>October 15 2019<br>
+<li>April 21 2020<br>
+        The <a href="download.html">XML Security Library 1.2.30</a> release includes the following changes:
+        <ul>
+        <li>Enabled XML_PARSE_HUGE for all xml parsers.</li>
+        <li>Added s390x support for travis (nayana-ibm).</li>
+        <li>Several other small fixes (<a href="https://github.com/lsh123/xmlsec/commits/master">more details</a>).</li>
+        </ul>
+</li>
+<br><li>October 15 2019<br>
         The <a href="download.html">XML Security Library 1.2.29</a> release includes the following changes:
         <ul>
         <li>Various build and tests fixes and improvements.</li>
diff --git a/docs/news.html b/docs/news.html
index 05c80c8e0..e55ac8906 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -420,7 +420,15 @@
 <h1>XML Security Library News</h1>
 </div>
 <ul>
-<li>October 15 2019<br>
+<li>April 21 2020<br>
+        The <a href="download.html">XML Security Library 1.2.30</a> release includes the following changes:
+        <ul>
+        <li>Enabled XML_PARSE_HUGE for all xml parsers.</li>
+        <li>Added s390x support for travis (nayana-ibm).</li>
+        <li>Several other small fixes (<a href="https://github.com/lsh123/xmlsec/commits/master">more details</a>).</li>
+        </ul>
+</li>
+<br><li>October 15 2019<br>
         The <a href="download.html">XML Security Library 1.2.29</a> release includes the following changes:
         <ul>
         <li>Various build and tests fixes and improvements.</li>
diff --git a/include/xmlsec/parser.h b/include/xmlsec/parser.h
index 743a58045..41e2dcecb 100644
--- a/include/xmlsec/parser.h
+++ b/include/xmlsec/parser.h
@@ -30,7 +30,7 @@ XMLSEC_EXPORT xmlDocPtr         xmlSecParseMemoryExt    (const xmlSecByte *prefi
                                                          xmlSecSize bufferSize,
                                                          const xmlSecByte *postfix,
                                                          xmlSecSize postfixSize);
-
+XMLSEC_EXPORT void				xmlSecParsePrepareCtxt	(xmlParserCtxtPtr ctxt);
 
 /**
  * xmlSecTransformXmlParserId:
diff --git a/man/xmlsec1-config.1 b/man/xmlsec1-config.1
index b9d255b9e..e52897b64 100644
--- a/man/xmlsec1-config.1
+++ b/man/xmlsec1-config.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH XMLSEC1-CONFIG "1" "October 2019" "xmlsec1-config 1.2.29" "User Commands"
+.TH XMLSEC1-CONFIG "1" "April 2020" "xmlsec1-config 1.2.30" "User Commands"
 .SH NAME
 xmlsec1-config \- detail installed version of xmlsec library
 .SH SYNOPSIS
diff --git a/man/xmlsec1.1 b/man/xmlsec1.1
index e4f3f8339..3587deabc 100644
--- a/man/xmlsec1.1
+++ b/man/xmlsec1.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH XMLSEC1 "1" "October 2019" "xmlsec1 1.2.29 (openssl)" "User Commands"
+.TH XMLSEC1 "1" "April 2020" "xmlsec1 1.2.30 (openssl)" "User Commands"
 .SH NAME
 xmlsec1 \- sign, verify, encrypt and decrypt XML documents
 .SH SYNOPSIS
diff --git a/src/dl.c b/src/dl.c
index b13f9d461..e934fe4e6 100644
--- a/src/dl.c
+++ b/src/dl.c
@@ -148,7 +148,18 @@ xmlSecCryptoDLLibraryCreate(const xmlChar* name) {
 #endif /* XMLSEC_DL_LIBLTDL */
 
 #ifdef XMLSEC_DL_WIN32
+#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
     lib->handle = LoadLibraryA((char*)lib->filename);
+#else
+    LPWSTR wcLibFilename = xmlSecWin32ConvertUtf8ToUnicode(lib->filename);
+    if(wcLibFilename == NULL) {
+        xmlSecIOError("xmlSecWin32ConvertUtf8ToTstr", lib->filename, NULL);
+        xmlSecCryptoDLLibraryDestroy(lib);
+        return(NULL);
+    }
+    lib->handle = LoadPackagedLibrary(wcLibFilename, 0);
+    xmlFree(wcLibFilename);
+#endif
     if(lib->handle == NULL) {
         xmlSecIOError("LoadLibraryA", lib->filename, NULL);
         xmlSecCryptoDLLibraryDestroy(lib);
diff --git a/src/openssl/crypto.c b/src/openssl/crypto.c
index 5be249fad..8762c1669 100644
--- a/src/openssl/crypto.c
+++ b/src/openssl/crypto.c
@@ -34,6 +34,7 @@
 #include <xmlsec/openssl/x509.h>
 
 static int              xmlSecOpenSSLErrorsInit                 (void);
+static void             xmlSecOpenSSLErrorsShutdown             (void);
 
 static xmlSecCryptoDLFunctionsPtr gXmlSecOpenSSLFunctions = NULL;
 static xmlChar* gXmlSecOpenSSLTrustedCertsFolder = NULL;
@@ -357,6 +358,7 @@ xmlSecOpenSSLInit (void)  {
 int
 xmlSecOpenSSLShutdown(void) {
     xmlSecOpenSSLSetDefaultTrustedCertsFolder(NULL);
+	xmlSecOpenSSLErrorsShutdown();
     return(0);
 }
 
@@ -452,18 +454,21 @@ xmlSecOpenSSLErrorsDefaultCallback(const char* file, int line, const char* func,
                 reason, msg);
 }
 
+#ifndef OPENSSL_IS_BORINGSSL
+static ERR_STRING_DATA xmlSecOpenSSLStrReasons[XMLSEC_ERRORS_MAX_NUMBER + 1];
+static ERR_STRING_DATA xmlSecOpenSSLStrLib[] = {
+    { ERR_PACK(XMLSEC_OPENSSL_ERRORS_LIB,0,0),      "xmlsec routines"},
+    { 0,                                            NULL}
+};
+static ERR_STRING_DATA xmlSecOpenSSLStrDefReason[]= {
+    { XMLSEC_OPENSSL_ERRORS_LIB,                    "xmlsec lib"},
+    { 0,                                            NULL}
+};
+#endif /* OPENSSL_IS_BORINGSSL */
+
 static int
 xmlSecOpenSSLErrorsInit(void) {
 #ifndef OPENSSL_IS_BORINGSSL
-    static ERR_STRING_DATA xmlSecOpenSSLStrReasons[XMLSEC_ERRORS_MAX_NUMBER + 1];
-    static ERR_STRING_DATA xmlSecOpenSSLStrLib[]= {
-        { ERR_PACK(XMLSEC_OPENSSL_ERRORS_LIB,0,0),      "xmlsec routines"},
-        { 0,                                            NULL}
-    };
-    static ERR_STRING_DATA xmlSecOpenSSLStrDefReason[]= {
-        { XMLSEC_OPENSSL_ERRORS_LIB,                    "xmlsec lib"},
-        { 0,                                            NULL}
-    };
     xmlSecSize pos;
 
     /* initialize reasons array */
@@ -473,7 +478,7 @@ xmlSecOpenSSLErrorsInit(void) {
         xmlSecOpenSSLStrReasons[pos].string = xmlSecErrorsGetMsg(pos);
     }
 
-    /* finally load xmlsec strings in OpenSSL */
+    /* load xmlsec strings in OpenSSL */
     ERR_load_strings(XMLSEC_OPENSSL_ERRORS_LIB, xmlSecOpenSSLStrLib); /* define xmlsec lib name */
     ERR_load_strings(XMLSEC_OPENSSL_ERRORS_LIB, xmlSecOpenSSLStrDefReason); /* define default reason */
     ERR_load_strings(XMLSEC_OPENSSL_ERRORS_LIB, xmlSecOpenSSLStrReasons);
@@ -485,6 +490,20 @@ xmlSecOpenSSLErrorsInit(void) {
     return(0);
 }
 
+
+static void
+xmlSecOpenSSLErrorsShutdown(void) {
+    /* remove callback */
+    xmlSecErrorsSetCallback(NULL);
+
+#ifndef OPENSSL_IS_BORINGSSL
+    /* unload xmlsec strings from OpenSSL */
+    ERR_unload_strings(XMLSEC_OPENSSL_ERRORS_LIB, xmlSecOpenSSLStrLib);
+    ERR_unload_strings(XMLSEC_OPENSSL_ERRORS_LIB, xmlSecOpenSSLStrDefReason);
+    ERR_unload_strings(XMLSEC_OPENSSL_ERRORS_LIB, xmlSecOpenSSLStrReasons);
+#endif /* OPENSSL_IS_BORINGSSL */
+}
+
 /**
  * xmlSecOpenSSLSetDefaultTrustedCertsFolder:
  * @path:       the default trusted certs path.
diff --git a/src/parser.c b/src/parser.c
index ddeb590c0..973727a02 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -143,7 +143,7 @@ xmlSecParserFinalize(xmlSecTransformPtr transform) {
 
 static int
 xmlSecParserPushBin(xmlSecTransformPtr transform, const xmlSecByte* data,
-                                xmlSecSize dataSize, int final, xmlSecTransformCtxPtr transformCtx) {
+                    xmlSecSize dataSize, int final, xmlSecTransformCtxPtr transformCtx) {
     xmlSecParserCtxPtr ctx;
     int ret;
 
@@ -162,11 +162,7 @@ xmlSecParserPushBin(xmlSecTransformPtr transform, const xmlSecByte* data,
             xmlSecXmlError("xmlCreatePushParserCtxt", xmlSecTransformGetName(transform));
             return(-1);
         }
-
-        /* required for c14n! */
-        ctx->parserCtx->loadsubset      = XML_DETECT_IDS | XML_COMPLETE_ATTRS;
-        ctx->parserCtx->replaceEntities = 1;
-        ctx->parserCtx->options         = XML_PARSE_NONET;
+        xmlSecParsePrepareCtxt(ctx->parserCtx);
 
         transform->status = xmlSecTransformStatusWorking;
     } else if(transform->status == xmlSecTransformStatusFinished) {
@@ -283,6 +279,7 @@ xmlSecParserPopXml(xmlSecTransformPtr transform, xmlSecNodeSetPtr* nodes,
         xmlFreeParserInputBuffer(buf);
         return(-1);
     }
+    xmlSecParsePrepareCtxt(ctxt);
 
     input = xmlNewIOInputStream(ctxt, buf, XML_CHAR_ENCODING_NONE);
     if(input == NULL) {
@@ -306,10 +303,6 @@ xmlSecParserPopXml(xmlSecTransformPtr transform, xmlSecNodeSetPtr* nodes,
         return(-1);
     }
 
-    /* required for c14n! */
-    ctxt->loadsubset = XML_DETECT_IDS | XML_COMPLETE_ATTRS;
-    ctxt->replaceEntities = 1;
-
     /* finaly do the parsing */
     ret = xmlParseDocument(ctxt);
     if(ret < 0) {
@@ -380,9 +373,7 @@ xmlSecParseFile(const char *filename) {
                         "filename=%s", xmlSecErrorsSafeString(filename));
         return(NULL);
     }
-
-    /* enable parsing of XML documents with large text nodes */
-    /* crashes on x64 xmlCtxtUseOptions (ctxt, XML_PARSE_HUGE); */
+    xmlSecParsePrepareCtxt(ctxt);
 
     /* todo: set directories from current doc? */
     if ((ctxt->directory == NULL) && (directory == NULL)) {
@@ -403,10 +394,6 @@ xmlSecParseFile(const char *filename) {
         }
     }
 
-    /* required for c14n! */
-    ctxt->loadsubset = XML_DETECT_IDS | XML_COMPLETE_ATTRS;
-    ctxt->replaceEntities = 1;
-
     ret = xmlParseDocument(ctxt);
     if(ret < 0) {
         xmlSecXmlParserError2("xmlParseDocument", ctxt, NULL,
@@ -465,10 +452,7 @@ xmlSecParseMemoryExt(const xmlSecByte *prefix, xmlSecSize prefixSize,
         xmlSecXmlError("xmlCreatePushParserCtxt", NULL);
         goto done;
     }
-
-    /* required for c14n! */
-    ctxt->loadsubset = XML_DETECT_IDS | XML_COMPLETE_ATTRS;
-    ctxt->replaceEntities = 1;
+    xmlSecParsePrepareCtxt(ctxt);
 
     /* prefix */
     if((prefix != NULL) && (prefixSize > 0)) {
@@ -548,10 +532,7 @@ xmlSecParseMemory(const xmlSecByte *buffer, xmlSecSize size, int recovery) {
         xmlSecXmlError("xmlCreateMemoryParserCtxt", NULL);
         return(NULL);
     }
-
-    /* required for c14n! */
-    ctxt->loadsubset = XML_DETECT_IDS | XML_COMPLETE_ATTRS;
-    ctxt->replaceEntities = 1;
+    xmlSecParsePrepareCtxt(ctxt);
 
     ret = xmlParseDocument(ctxt);
     if(ret < 0) {
@@ -581,3 +562,26 @@ xmlSecParseMemory(const xmlSecByte *buffer, xmlSecSize size, int recovery) {
     return(res);
 }
 
+/**
+ * xmlSecParsePrepareCtxt:
+ * @ctxt:               the parser context
+ *
+ * Prepares parser context for parsing XML for XMLSec.
+ */
+void
+xmlSecParsePrepareCtxt(xmlParserCtxtPtr ctxt) {
+	xmlSecAssert(ctxt != NULL);
+
+    /* required for c14n! */
+    ctxt->loadsubset = XML_DETECT_IDS | XML_COMPLETE_ATTRS;
+    ctxt->replaceEntities = 1;
+
+    /*
+     * Also see xmlSecReplaceNodeBufferAndReturn:
+     *
+     * XML_PARSE_NONET  to support c14n
+     * XML_PARSE_NODICT to avoid problems with moving nodes around
+     * XML_PARSE_HUGE   to enable parsing of XML documents with large text nodes
+     */
+    xmlCtxtUseOptions(ctxt, XML_PARSE_NONET | XML_PARSE_NODICT | XML_PARSE_HUGE);
+}
diff --git a/src/xmldsig.c b/src/xmldsig.c
index 619e725a5..a5f5626d5 100644
--- a/src/xmldsig.c
+++ b/src/xmldsig.c
@@ -1215,6 +1215,7 @@ xmlSecDSigReferenceCtxInitialize(xmlSecDSigReferenceCtxPtr dsigRefCtx, xmlSecDSi
     }
     dsigRefCtx->transformCtx.preExecCallback = dsigCtx->referencePreExecuteCallback;
     dsigRefCtx->transformCtx.enabledUris = dsigCtx->enabledReferenceUris;
+    dsigRefCtx->transformCtx.userData = dsigCtx->userData;
 
     if((dsigCtx->flags & XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK) != 0) {
         dsigRefCtx->transformCtx.flags |= XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK;
diff --git a/src/xmlenc.c b/src/xmlenc.c
index 825ed4c44..dcee06c3e 100644
--- a/src/xmlenc.c
+++ b/src/xmlenc.c
@@ -399,7 +399,7 @@ xmlSecEncCtxXmlEncrypt(xmlSecEncCtxPtr encCtx, xmlNodePtr tmpl, xmlNodePtr node)
 
     /* now we need to update our original document */
     if((encCtx->type != NULL) && xmlStrEqual(encCtx->type, xmlSecTypeEncElement)) {
-        /* check if we need to return the replaced node */
+    	/* check if we need to return the replaced node */
         if((encCtx->flags & XMLSEC_ENC_RETURN_REPLACED_NODE) != 0) {
             ret = xmlSecReplaceNodeAndReturn(node, tmpl, &(encCtx->replacedNodeList));
             if(ret < 0) {
@@ -415,10 +415,9 @@ xmlSecEncCtxXmlEncrypt(xmlSecEncCtxPtr encCtx, xmlNodePtr tmpl, xmlNodePtr node)
                 return(-1);
             }
         }
-
-            encCtx->resultReplaced = 1;
+        encCtx->resultReplaced = 1;
     } else if((encCtx->type != NULL) && xmlStrEqual(encCtx->type, xmlSecTypeEncContent)) {
-        /* check if we need to return the replaced node */
+    	/* check if we need to return the replaced node */
         if((encCtx->flags & XMLSEC_ENC_RETURN_REPLACED_NODE) != 0) {
             ret = xmlSecReplaceContentAndReturn(node, tmpl, &(encCtx->replacedNodeList));
             if(ret < 0) {
@@ -434,7 +433,6 @@ xmlSecEncCtxXmlEncrypt(xmlSecEncCtxPtr encCtx, xmlNodePtr tmpl, xmlNodePtr node)
                 return(-1);
             }
         }
-
         encCtx->resultReplaced = 1;
     } else {
         /* we should've caught this error before */
diff --git a/src/xmltree.c b/src/xmltree.c
index df99931d0..9e35fa1c2 100644
--- a/src/xmltree.c
+++ b/src/xmltree.c
@@ -562,9 +562,6 @@ xmlSecReplaceContentAndReturn(xmlNodePtr node, xmlNodePtr newNode, xmlNodePtr *r
     xmlSecAssert2(node != NULL, -1);
     xmlSecAssert2(newNode != NULL, -1);
 
-    xmlUnlinkNode(newNode);
-    xmlSetTreeDoc(newNode, node->doc);
-
     /* return the old nodes if requested */
     if(replaced != NULL) {
         xmlNodePtr cur, next, tail;
@@ -573,7 +570,7 @@ xmlSecReplaceContentAndReturn(xmlNodePtr node, xmlNodePtr newNode, xmlNodePtr *r
         for(cur = node->children; (cur != NULL); cur = next) {
             next = cur->next;
             if((*replaced) != NULL) {
-                /* n is unlinked in this function */
+                /* cur is unlinked in this function */
                 xmlAddNextSibling(tail, cur);
                 tail = cur;
             } else {
@@ -587,8 +584,9 @@ xmlSecReplaceContentAndReturn(xmlNodePtr node, xmlNodePtr newNode, xmlNodePtr *r
         xmlNodeSetContent(node, NULL);
     }
 
-    xmlAddChild(node, newNode);
-    xmlSetTreeDoc(newNode, node->doc);
+    /* swap nodes */
+    xmlUnlinkNode(newNode);
+    xmlAddChildList(node, newNode);
 
     return(0);
 }
@@ -628,8 +626,13 @@ xmlSecReplaceNodeBufferAndReturn(xmlNodePtr node, const xmlSecByte *buffer, xmlS
     xmlSecAssert2(node != NULL, -1);
     xmlSecAssert2(node->parent != NULL, -1);
 
-    /* parse buffer in the context of node's parent */
-    ret = xmlParseInNodeContext(node->parent, (const char*)buffer, size, XML_PARSE_NODICT, &results);
+    /* parse buffer in the context of node's parent (also see xmlSecParsePrepareCtxt):
+     * XML_PARSE_NONET  to support c14n
+     * XML_PARSE_NODICT to avoid problems with moving nodes around
+     * XML_PARSE_HUGE   to enable parsing of XML documents with large text nodes
+     */
+    ret = xmlParseInNodeContext(node->parent, (const char*)buffer, size,
+    		XML_PARSE_NONET | XML_PARSE_NODICT | XML_PARSE_HUGE, &results);
     if(ret != XML_ERR_OK) {
         xmlSecXmlError("xmlParseInNodeContext", NULL);
         return(-1);
@@ -868,7 +871,6 @@ xmlSecPrintXmlString(FILE * fd, const xmlChar * str) {
     return(res);
 }
 
-
 /**
  * xmlSecGetQName:
  * @node:               the context node.
diff --git a/src/xslt.c b/src/xslt.c
index cc596e81b..ba0ff79ca 100644
--- a/src/xslt.c
+++ b/src/xslt.c
@@ -284,7 +284,7 @@ xmlSecXsltReadNode(xmlSecTransformPtr transform, xmlNodePtr node, xmlSecTransfor
 
 static int
 xmlSecXsltPushBin(xmlSecTransformPtr transform, const xmlSecByte* data,
-                                xmlSecSize dataSize, int final, xmlSecTransformCtxPtr transformCtx) {
+                  xmlSecSize dataSize, int final, xmlSecTransformCtxPtr transformCtx) {
     xmlSecXsltCtxPtr ctx;
     int ret;
 
@@ -305,10 +305,7 @@ xmlSecXsltPushBin(xmlSecTransformPtr transform, const xmlSecByte* data,
             xmlSecXmlError("xmlCreatePushParserCtxt", xmlSecTransformGetName(transform));
             return(-1);
         }
-
-        /* required for c14n! */
-        ctx->parserCtx->loadsubset = XML_DETECT_IDS | XML_COMPLETE_ATTRS;
-        ctx->parserCtx->replaceEntities = 1;
+        xmlSecParsePrepareCtxt(ctx->parserCtx);
 
         transform->status = xmlSecTransformStatusWorking;
     } else if(transform->status == xmlSecTransformStatusFinished) {