Merge the code from develop to master for 2.4.0Enea_NFV_Access_2.4.0hotfix_EDGESC-6feature_CPDX-3546EE240_HotFix1

Change-Id: Ibc844e001b7d75125d6006fa5333cc65bbf5afa4

150 files changed, 7376 insertions, 7490 deletions

diff --git a/doc/Makefile b/doc/Makefile
index 024d6ca..9621b72 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -23,13 +23,13 @@ include init.mk
 
 
 # ******************* AutoGenerated chapters from template and target READMEs *******
-#BUILDBOOT_XML       := book-enea-nfv-access-release-info/doc/build_boot_generated.xml
-#BUILDBOOT_TEMPLATE  := book-enea-nfv-access-release-info/doc/build_boot_template.xml
+#BUILDBOOT_XML       := book-enea-edge-release-info/doc/build_boot_generated.xml
+#BUILDBOOT_TEMPLATE  := book-enea-edge-release-info/doc/build_boot_template.xml
 
-PKGDIFF_GEN_XML     := book-enea-nfv-access-release-info/doc/pkgdiff_generated.xml
-JIRA_ISSUES_GEN_XML := book-enea-nfv-access-release-info/doc/jiraissues_generated.xml
+#PKGDIFF_GEN_XML     := book-enea-edge-release-info/doc/pkgdiff_generated.xml
+#JIRA_ISSUES_GEN_XML := book-enea-edge-release-info/doc/jiraissues_generated.xml
 
-MACHINE_LIST_XML    := book-enea-nfv-access-release-info/doc/machine_list_generated.xml
+MACHINE_LIST_XML    := book-enea-edge-release-info/doc/machine_list_generated.xml
 
 ELTF_PARAMS_TEMPLATE := s_doceneacommon/doc/eltf_params_template.xml
 ELTF_PARAMS_UPDATED  := s_doceneacommon/doc/eltf_params_updated.xml
@@ -50,7 +50,7 @@ DOCBOOK_TO_BOOKDIR ?= yes
 DOCBOOK_CLEANTMP ?= yes
 
 #Components (books) in this subsystem. Now use all books found here
-COMPONENTS := book-enea-nfv-access-auto-fw-th-open-source book-enea-nfv-access-auto-fw-th-user-guide book-enea-nfv-access-cmc-example-usecases book-enea-nfv-access-example-usecases book-enea-nfv-access-getting-started book-enea-nfv-access-platform-open-source book-enea-nfv-access-getting-started book-enea-nfv-access-ucpem-open-source book-enea-nfv-access-release-info book-enea-nfv-access-system-test-specification book-enea-nfv-access-evalkit
+COMPONENTS := book-enea-edge-auto-fw-th-open-source book-enea-edge-auto-fw-th-user-guide book-enea-nfv-access-evalkit book-enea-edge-example-usecases book-enea-edge-getting-started book-enea-edge-runtime-open-source book-enea-edge-release-info book-enea-edge-system-test-specification book-enea-edge-telemetry-open-source book-enea-edge-management-open-source
 
 
 # --------------------------------------------------------------
@@ -184,7 +184,7 @@ endif
 books: init
 # BOOKPACKAGES is defined in all book-*/swcomp.mk
         $(VERB)DISTRO_VERSION=`egrep '"EneaLinux_REL_VER"><phrase>' $(ELTF_PARAMS_UPDATED) | sed 's/.*<phrase>//;s/<\/phrase>.*//'` ; BUILD_NUMBER=`egrep '"ENA_BUILD_VER"><phrase>'  $(ELTF_PARAMS_UPDATED) | sed 's/.*<phrase>//;s/<\/phrase>.*//'` ; \
-               BOOKVER="Enea NFV Access-$$DISTRO_VERSION-build-$$BUILD_NUMBER"; \
+               BOOKVER="Enea Edge-$$DISTRO_VERSION-build-$$BUILD_NUMBER"; \
          for book in $(BOOKPACKAGES); do \
           for format in $(FORMAT); do \
             $(MAKE) -f $(DOCBOOKMAKE)/make_docbook_standalone.mk BOOK=$$book FORMAT=$$format BOOK_VER="$$BOOKVER" books || exit 10; \
diff --git a/doc/book-enea-edge-auto-fw-th-open-source/doc/README b/doc/book-enea-edge-auto-fw-th-open-source/doc/README
new file mode 100644
index 0000000..a2c3d63
--- /dev/null
+++ b/doc/book-enea-edge-auto-fw-th-open-source/doc/README
@@ -0,0 +1,3 @@
+The licenses.xml in the git repository of Enea Edge AFTH Open Source Report
+is the frozen version belonging to the last official release of Enea Edge.
+
diff --git a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/about.xml b/doc/book-enea-edge-auto-fw-th-open-source/doc/about.xml
index dbf06e3..24f674d 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/about.xml
+++ b/doc/book-enea-edge-auto-fw-th-open-source/doc/about.xml
@@ -5,8 +5,8 @@
   <title>About this Report</title>
 
   <para>This document contains the open source and license information
-  pertaining to the Automation Framework and Test Harness provided with
-  Enea NFV Access <xi:include
+  pertaining to the Enea Edge Automation Framework and Test Harness provided with
+  Enea Edge <xi:include
   href="../../s_doceneacommon/doc/eltf_params_updated.xml"
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xpointer="element(EneaLinux_REL_VER/1)" />.</para>
diff --git a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/book.xml b/doc/book-enea-edge-auto-fw-th-open-source/doc/book.xml
index 3305873..df5e029 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/book.xml
+++ b/doc/book-enea-edge-auto-fw-th-open-source/doc/book.xml
@@ -3,8 +3,8 @@
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED">
 ]>
-<book id="book_enea_nfv_access_auto_fw_th_open_source">
-  <title><trademark class="registered">Enea</trademark> NFV Access Automation Framework and Test Harness Open Source Report</title>
+<book id="book_enea_edge_auto_fw_th_open_source">
+  <title><trademark class="registered">Enea</trademark> Edge Automation Framework and Test Harness Open Source Report</title>
   
   <subtitle>Release Version
          <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
diff --git a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/licenses.xml b/doc/book-enea-edge-auto-fw-th-open-source/doc/licenses.xml
index 31e8edb..397e2b8 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/licenses.xml
+++ b/doc/book-enea-edge-auto-fw-th-open-source/doc/licenses.xml
@@ -33,28 +33,28 @@
 
         <tbody valign="top">
           <row>
-            <entry>Automation Framework and Test Harness</entry>
+            <entry>Enea Edge Automation Framework and Test Harness</entry>
 
             <entry><xi:include
             href="../../s_doceneacommon/doc/eltf_params_updated.xml"
             xmlns:xi="http://www.w3.org/2001/XInclude"
             xpointer="element(EneaLinux_REL_VER/1)" /></entry>
 
-            <entry>Configuration and Automation Framework for the uCPE Manager
+            <entry>Configuration and Automation Framework for the Enea Edge Management
             GUI.</entry>
 
             <entry>ENEA-SRC-R2</entry>
           </row>
 
           <row>
-            <entry>Automation Framework and Test Harness</entry>
+            <entry>Enea Edge Automation Framework and Test Harness</entry>
 
             <entry><xi:include
             href="../../s_doceneacommon/doc/eltf_params_updated.xml"
             xmlns:xi="http://www.w3.org/2001/XInclude"
             xpointer="element(EneaLinux_REL_VER/1)" /></entry>
 
-            <entry>Configuration and Automation Framework for the uCPE Manager
+            <entry>Configuration and Automation Framework for the Enea Edge Management
             GUI.</entry>
 
             <entry>ENEA-EXAMPLE-R2</entry>
@@ -74,7 +74,7 @@
     <section id="lic_0">
       <title>ENEA-SRC-R2</title>
 
-      <para><programlisting> Copyright (C) 2019 by Enea.
+      <para><programlisting> Copyright (C) 2019 by Enea Software AB.
  All rights reserved.
 
  This Software is furnished under a software license agreement and
diff --git a/doc/book-enea-nfv-access-cmc-example-usecases/swcomp.mk b/doc/book-enea-edge-auto-fw-th-open-source/swcomp.mk
index ca26c5c..24463ac 100755..100644
--- a/doc/book-enea-nfv-access-cmc-example-usecases/swcomp.mk
+++ b/doc/book-enea-edge-auto-fw-th-open-source/swcomp.mk
@@ -5,6 +5,6 @@ BOOK_VER ?= $(REL_VER)-dev
 
 DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
 
-BOOKPACKAGES := book-enea-nfv-access-cmc-example-usecases
-BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access $(PROD_VER) for CMC Networks Example Use-cases"
+BOOKPACKAGES := book-enea-edge-auto-fw-th-open-source
+BOOKDESC_$(BOOKPACKAGES) := "Enea Edge $(PROD_VER) Automation Framework and Test Harness Open Source Report"
 BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml b/doc/book-enea-edge-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
index 4ab9cd1..9f6e64f 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="auto_fw_test_harness">
   <title>Automation Framework and Test Harness</title>
 
@@ -11,15 +11,16 @@
 
     <para>The <literal>/device</literal> folder contains Python scripts for
     adding uCPE device(s), receiving uCPE events' reports, removing a uCPE
-    device, waiting for a uCPE device to connect to the uCPE Manager, as well
-    as scripts for adding and removing an offline configuration store. This
-    folder also contains scripts for uploading and removing an NFVA image into
-    the uCPE Manager, and for installing and activating a NFVA image on a uCPE
-    Device.</para>
+    device, waiting for a uCPE device to connect to the Enea Edge Management
+    application, as well as scripts for adding and removing an offline
+    configuration store. This folder also contains scripts for uploading and
+    removing an NFVA image into the Enea Edge Management application, and for
+    installing and activating a NFVA image on a uCPE Device.</para>
 
     <para>The <literal>/customScripts</literal> folder contains Python scripts
-    for uploading custom scripts onto the uCPE Manager and uCPE device(s), for
-    removing custom scripts from the uCPE Manager and uCPE device(s).</para>
+    for uploading custom scripts onto the Enea Edge Management application and
+    uCPE device(s), for removing custom scripts from the Enea Edge Management
+    application and uCPE device(s).</para>
 
     <para>The <literal>/network</literal> folder contains Python scripts for
     binding or unbinding a network interface to and from a uCPE device (DPDK
@@ -32,12 +33,20 @@
       <para>Commands within the network folder that include the option
       <emphasis role="bold">-o</emphasis> allow the user to perform the action
       in an offline configuration store alternative available for use at a
-      later setup time. Commands that include the <emphasis
-      role="bold">-n</emphasis> option refer to a uCPE device, with the
-      operation being performed on uCPE device. All options contain either
-      <emphasis role="bold">-n</emphasis>, <emphasis role="bold">-o</emphasis>
-      or both. One of them must always be provided, if both are provided, -o
-      has priority, and -n is thus ignored.</para>
+      later setup time.</para>
+
+      <para>Commands that include the <emphasis role="bold">-n</emphasis>
+      option refer to a uCPE device, with the operation being performed on
+      uCPE device.</para>
+
+      <para>All options contain either <emphasis role="bold">-n</emphasis>,
+      <emphasis role="bold">-o</emphasis> or both. One of them must always be
+      provided, if both are provided, -o has priority, and -n is thus
+      ignored.</para>
+
+      <para>In the following script examples, <emphasis>Enea Edge Management
+      </emphasis> is reffered as <emphasis>Enea uCPE
+      Manager</emphasis>.</para>
     </note>
 
     <para>The <literal>/unittestSuite</literal> folder contains JSON files for
@@ -79,8 +88,8 @@
       the path to the file describing the test cases to be performed against
       the designated script.</para>
 
-      <para>Steps for running the Python unit-test suite on the uCPE Manager
-      are provided below.</para>
+      <para>Steps for running the Python unit-test suite on the Enea Edge
+      Management application are provided below.</para>
 
       <section id="script_opts">
         <title>Script Options</title>
@@ -234,26 +243,27 @@ consoleLoggingLevel = logging.INFO
               <row>
                 <entry><literal>username</literal></entry>
 
-                <entry>The user authentication used to log into the uCPE
-                Manager. This can be overwritten by setting the Python
-                unit-test suite command line option
+                <entry>The user authentication used to log into the Enea Edge
+                Management application. This can be overwritten by setting the
+                Python unit-test suite command line option
                 <literal>-u</literal>.</entry>
               </row>
 
               <row>
                 <entry><literal>password</literal></entry>
 
-                <entry>The password used to log into the uCPE Manager. This
-                can be overwritten by setting the Python unit-test suite
-                command line option <literal>-p</literal>.</entry>
+                <entry>The password used to log into the Enea Edge Management
+                application. This can be overwritten by setting the Python
+                unit-test suite command line option
+                <literal>-p</literal>.</entry>
               </row>
 
               <row>
                 <entry><literal>host</literal></entry>
 
-                <entry>The IP address of the uCPE Manager host. This can be
-                overwritten by setting the Python unit-test suite command line
-                option <literal>-H</literal>.</entry>
+                <entry>The IP address of the Enea Edge Management application
+                host. This can be overwritten by setting the Python unit-test
+                suite command line option <literal>-H</literal>.</entry>
               </row>
 
               <row>
@@ -343,6 +353,12 @@ NOTSET 0</programlisting></para>
       <section id="run_ut_suite">
         <title>Running Python Unit-Test Suite</title>
 
+        <note>
+          <para>Please update all JSON configuration files to use the name of
+          your vCPE agent device. In the following chapters, intelc3850-2 is
+          used as an example.</para>
+        </note>
+
         <para>Below you'll find sample unit-test command line options for
         running the Fortigate <emphasis role="bold">deployment</emphasis>
         scenario:</para>
@@ -533,8 +549,8 @@ OK</programlisting>
     <section id="add_ucpe_device">
       <title>Adding a uCPE Device</title>
 
-      <para>Steps for adding, configuring and running a uCPE device onto the
-      uCPE manager are described below .</para>
+      <para>Steps for adding, configuring and running a uCPE device into the
+      Enea Edge Management application are described below .</para>
 
       <section id="opts_add_device">
         <title>Script Options</title>
@@ -586,7 +602,7 @@ Options:
  "deviceGroupingTags": " ",
  "description": "",
  "address": "172.24.12.114",
- "version": "2.3.0",
+ "version": "2.4.0",
  "port": "22",
  "username": "root",
  "password": "root",
@@ -618,8 +634,8 @@ Options:
     <section id="remove_ucpe_device">
       <title>Removing a uCPE Device</title>
 
-      <para>Steps for removing a uCPE device from the uCPE manager are
-      described below.</para>
+      <para>Steps for removing a uCPE device from the Enea Edge Management
+      application are described below.</para>
 
       <section id="rem_script_opts">
         <title>Script Options</title>
@@ -695,7 +711,8 @@ host
       <title>Waiting a uCPE Device</title>
 
       <para>Steps and details for how to Wait a uCPE device to connect to the
-      uCPE Manager after installation, are described below.</para>
+      Enea Edge Management application after installation, are described
+      below.</para>
 
       <section id="wait_script_opts">
         <title>Script Options</title>
@@ -773,7 +790,8 @@ Options:
       <title>Printing the uCPE Device Log</title>
 
       <para>Steps and details on how to Print the events log for a specific
-      uCPE device installed in the uCPE Manager, are explained below.</para>
+      uCPE device installed in the Enea Edge Management application, are
+      explained below.</para>
 
       <section id="print_script_opts">
         <title>Script Options</title>
@@ -1374,8 +1392,8 @@ Options:
     <section id="onboard_vnf_image">
       <title>Onboarding a VNF Image Raw</title>
 
-      <para>How to Onboard a VNF image in the uCPE Manager based upon its raw
-      constituents, is detailed in depth below.</para>
+      <para>How to Onboard a VNF image in the Enea Edge Management application
+      based upon its raw constituents, is detailed in depth below.</para>
 
       <section id="script_opts_image">
         <title>Script Options</title>
@@ -1491,8 +1509,8 @@ Options:
     <section id="offboard_vnf">
       <title>Offboarding a VNF</title>
 
-      <para>Steps on how to Offboard a VNF from the uCPE Manager are detailed
-      below.</para>
+      <para>Steps on how to Offboard a VNF from the Enea Edge Management
+      application are detailed below.</para>
 
       <section id="script_opts_offimage">
         <title>Script Options</title>
@@ -1557,7 +1575,8 @@ Options:
     <section id="instantiate_vnf">
       <title>Instantiating a VNF</title>
 
-      <para>Instantiating a VNF via the uCPE Manager is detailed below.</para>
+      <para>Instantiating a VNF via the Enea Edge Management application is
+      detailed below.</para>
 
       <section id="script_opts_inst">
         <title>Script Options</title>
@@ -1636,8 +1655,8 @@ License("vnf_config/fortigateImage/fortigateLicense.lic")
     <section id="control_vnf_inst">
       <title>Controlling a VNF Instance</title>
 
-      <para>How to Control a VNF instance from the Enea uCPE Manager is
-      detailed below.</para>
+      <para>How to Control a VNF instance from the Enea Edge Management
+      application is detailed below.</para>
 
       <note>
         <para>If a sequence of commands aiming to change the state of the VNF
@@ -1645,7 +1664,8 @@ License("vnf_config/fortigateImage/fortigateLicense.lic")
         become unresponsive. Depending on the actual VNF, the time required
         between life-cycle operations may vary from several seconds to half a
         minute or even more. If a VNF becomes unresponsive, the only possible
-        action is to "Force Delete" the instance from the uCPE Manager.</para>
+        action is to "Force Delete" the instance from the Enea Edge Management
+        application.</para>
       </note>
 
       <section id="script_opts_control">
@@ -1730,7 +1750,7 @@ fortigateFWInstance -c stop
       <title>Destroying a VNF Instance</title>
 
       <para>Steps and options on how to Destroy a VNF instance from the Enea
-      uCPE Manager are described below.</para>
+      Edge Management are described below.</para>
 
       <section id="script_opts_destroy">
         <title>Script Options</title>
@@ -1795,10 +1815,11 @@ fortigateFWInstance
     </section>
 
     <section id="upload_vnf_image">
-      <title>Uploading a NFV Access image onto the Enea uCPE Manager</title>
+      <title>Uploading an Enea Edge image onto the Enea Edge Management
+      application</title>
 
-      <para>Steps and options on how to Upload a NFV Access image onto the
-      Enea uCPE Manager are described below.</para>
+      <para>Steps and options on how to Upload an Enea Edge image onto the
+      Enea Edge Management application are described below.</para>
 
       <section id="script_opts_upload">
         <title>Script Options</title>
@@ -1832,7 +1853,7 @@ Options:
       <section id="json_upload">
         <title>Configuring the JSON File</title>
 
-        <para>The JSON configuration file needed to upload a NFV Access image
+        <para>The JSON configuration file needed to upload an Enea Edge image
         should contain a list of dictionaries. Each dictionary indicates the
         test case name and the test case arguments passed to the
         <filename>uploadImage</filename> Python module.</para>
@@ -1868,11 +1889,11 @@ Options:
     </section>
 
     <section id="delete_vnf_image">
-      <title>Deleting a NFV Access image file from the Enea uCPE
-      Manager</title>
+      <title>Deleting an Enea Edge image file from the Enea Edge Management
+      application</title>
 
-      <para>Steps and options on how to Delete a NFV Access image from the
-      Enea uCPE Manager are described below.</para>
+      <para>Steps and options on how to Delete an Enea Edge image from the
+      Enea Edge Management application are described below.</para>
 
       <section id="script_opts_deleteupload">
         <title>Script Options</title>
@@ -1903,7 +1924,7 @@ Options:
       <section id="json_delete_upload">
         <title>Configuring the JSON File</title>
 
-        <para>The JSON configuration file needed to delete a NFV Access image
+        <para>The JSON configuration file needed to delete an Enea Edge image
         should contain a list of dictionaries. Each dictionary indicates the
         test case name and the test case arguments passed to the
         <filename>deleteUpgradeFile</filename> Python module.</para>
@@ -1942,12 +1963,12 @@ image was successfully removed
     </section>
 
     <section id="install_activate_vnf_image">
-      <title>Installing and activating a NFV Access image on an uCPE device
-      from the Enea uCPE Manager</title>
+      <title>Installing and activating an Enea Edge image on an uCPE device
+      from the Enea Edge Management application</title>
 
-      <para>Steps and options on how to Install and Activate a NFV Access
-      image on an uCPE device from the Enea uCPE Manager are described
-      below.</para>
+      <para>Steps and options on how to Install and Activate an Enea Edge
+      image on an uCPE device from the Enea Edge Management application are
+      described below.</para>
 
       <section id="script_opts_install_activate">
         <title>Script Options</title>
@@ -1983,10 +2004,10 @@ Options:
       <section id="json_install_activate">
         <title>Configuring the JSON File</title>
 
-        <para>The JSON configuration file needed to install and activate a NFV
-        Access image on a uCPE device from the Enea uCPE Manager should
-        contain a list of dictionaries. Each dictionary indicates the test
-        case name and the test case arguments passed to the
+        <para>The JSON configuration file needed to install and activate an
+        Enea Edge image on a uCPE device from the Enea Edge Management
+        application should contain a list of dictionaries. Each dictionary
+        indicates the test case name and the test case arguments passed to the
         <filename>installAndActivate</filename> Python module.</para>
 
         <para><emphasis role="bold">Sample unit-test JSON file
@@ -2049,11 +2070,11 @@ enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 [20]
 
     <section id="clearing_info_upgrade">
       <title>Clearing information about completed upgrades of uCPE devices
-      from the Enea uCPE Manager</title>
+      from the Enea Edge Management application</title>
 
       <para>Steps and options on how to clear information about completed
-      upgrades of uCPE devices from the Enea uCPE Manager are described
-      below.</para>
+      upgrades of uCPE devices from the Enea Edge Management application are
+      described below.</para>
 
       <section id="script_opts_clearinfo">
         <title>Script Options</title>
@@ -2081,9 +2102,9 @@ Options:
         <title>Configuring the JSON File</title>
 
         <para>No JSON configuration file is needed to clear information about
-        completed upgrades of uCPE devices from the Enea uCPE Manager. The
-        <filename>clearCompletedUpgradesInfo</filename> Python module can be
-        run without a JSON file as a parameter.</para>
+        completed upgrades of uCPE devices from the Enea Edge Management
+        application. The <filename>clearCompletedUpgradesInfo</filename>
+        Python module can be run without a JSON file as a parameter.</para>
       </section>
 
       <section id="pymod_clear_info">
@@ -2104,10 +2125,11 @@ Options:
     </section>
 
     <section id="upload_custom_script">
-      <title>Uploading a Custom Script to the uCPE Manager</title>
+      <title>Uploading a Custom Script to the Enea Edge Management
+      application</title>
 
-      <para>Steps and options on how to upload a custom script to the uCPE
-      Manager are described below.</para>
+      <para>Steps and options on how to upload a custom script to the Enea
+      Edge Management application are described below.</para>
 
       <section id="script_opts_upload_custom_script">
         <title>Script Options</title>
@@ -2141,8 +2163,9 @@ Options:
         <title>Configuring the JSON File</title>
 
         <para>The JSON configuration file needed to upload a Custom Script to
-        the uCPE Manager must contain a list of dictionaries. Each dictionary
-        indicates the test case name and the test case arguments passed to the
+        the Enea Edge Management application must contain a list of
+        dictionaries. Each dictionary indicates the test case name and the
+        test case arguments passed to the
         <filename>customScripts/upload</filename> Python module.</para>
 
         <para><emphasis role="bold">Sample unit-test JSON file
@@ -2178,11 +2201,11 @@ echo test_success_after_always
     </section>
 
     <section id="upload_custom_script_device">
-      <title>Uploading a Custom Script from the uCPE Manager to a
-      Device</title>
+      <title>Uploading a Custom Script from the Enea Edge Management
+      application to a Device</title>
 
-      <para>Steps and options on how to upload a custom script from the uCPE
-      Manager to a Device are described below.</para>
+      <para>Steps and options on how to upload a custom script from the Enea
+      Edge Management application to a Device are described below.</para>
 
       <section id="script_opts_upload_custom_script_device">
         <title>Script Options</title>
@@ -2219,9 +2242,9 @@ Options:
         <title>Configuring the JSON File</title>
 
         <para>The JSON configuration file needed to upload a Custom Script
-        from the uCPE Manager to a Device must contain a list of dictionaries.
-        Each dictionary indicates the test case name and the test case
-        arguments passed to the
+        from the Enea Edge Management application to a Device must contain a
+        list of dictionaries. Each dictionary indicates the test case name and
+        the test case arguments passed to the
         <filename>customScripts/uploadOnDevice</filename> Python
         module.</para>
 
@@ -2257,10 +2280,11 @@ test_success_after_always -e always-after-startup -n inteld1521-6
     </section>
 
     <section id="delete_custom_script">
-      <title>Removing a Custom Script from the uCPE Manager</title>
+      <title>Removing a Custom Script from the Enea Edge Management
+      application</title>
 
-      <para>Steps and options on how to remove a custom script from the uCPE
-      Manager are described below.</para>
+      <para>Steps and options on how to remove a custom script from the Enea
+      Edge Management application are described below.</para>
 
       <section id="script_opts_delete_custom_script">
         <title>Script Options</title>
@@ -2294,9 +2318,10 @@ Options:
         <title>Configuring the JSON File</title>
 
         <para>The JSON configuration file needed to remove a Custom Script
-        from the uCPE Manager<remark>did you mean device or uCPE
-        Manager?</remark> must contain a list of dictionaries. Each dictionary
-        indicates the test case name and the test case arguments passed to the
+        from the Enea Edge Management application<remark>did you mean device
+        or Enea Edge Management application?</remark> must contain a list of
+        dictionaries. Each dictionary indicates the test case name and the
+        test case arguments passed to the
         <filename>customScripts/delete</filename> Python module.</para>
 
         <para><emphasis role="bold">Sample unit-test JSON file
@@ -2407,18 +2432,141 @@ phase always-after-startup from inteld1521-6
       </section>
     </section>
 
+    <section id="custom_script_eg">
+      <title>Custom Script - Full Example</title>
+
+      <para>All Python API used in this example are described in detail in the
+      following sections.</para>
+
+      <para>The list of custom scripts can be found in
+      <literal>&lt;AF-TH-install-dir&gt;/lab_config/customScripts</literal>:</para>
+
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para><filename>test_fail_after_always</filename>. Phase:
+          always-after-startup.</para>
+        </listitem>
+
+        <listitem>
+          <para><filename>test_fail_after_once</filename>. Phase:
+          once-after-startup.</para>
+        </listitem>
+
+        <listitem>
+          <para><filename>test_fail_before_always</filename>. Phase:
+          always-before-startup.</para>
+        </listitem>
+
+        <listitem>
+          <para><filename>test_fail_before_once</filename>. Phase:
+          once-before-startup.</para>
+        </listitem>
+
+        <listitem>
+          <para><filename>test_success_after_always</filename>. Phase:
+          always-after-startup.</para>
+        </listitem>
+
+        <listitem>
+          <para><filename>test_success_after_once</filename>. Phase:
+          once-after-startup.</para>
+        </listitem>
+
+        <listitem>
+          <para><filename>test_success_before_always</filename>. Phase:
+          always-before-startup.</para>
+        </listitem>
+
+        <listitem>
+          <para><filename>test_success_before_once</filename>. Phase:
+          once-before-startup.</para>
+        </listitem>
+      </itemizedlist>
+
+      <note>
+        <para>The following example uses the
+        <filename>test_success_after_always</filename> custom script.</para>
+      </note>
+
+      <section id="upload_customscrp_ucpemg">
+        <title>Uploading a Custom Script to the Enea Edge Management
+        application</title>
+
+        <programlisting>$ python automation_framework/customScripts/upload.py \
+-f lab_config/customScripts/test_success_after_always -e always-after-startup
+2020-04-14 14:08:02,824 - DEBUG: Started logging
+2020-04-14 14:08:02,915 - INFO: Upload Custom Script
+2020-04-14 14:08:02,994 - DEBUG: Login successful on host '172.24.3.109'
+2020-04-14 14:08:02,995 - DEBUG: Session token is: 97544990-7e48-11ea-835c-02423a1c239f
+2020-04-14 14:08:02,996 - DEBUG: Upload test_success_after_always to uCPE Manager. \
+Content: #!/bin/bash
+echo test_success_after_always
+2020-04-14 14:08:03,138 - INFO: Done
+2020-04-14 14:08:03,169 - DEBUG: Logging out and exiting...</programlisting>
+      </section>
+
+      <section id="upload_customscrp_device">
+        <title>Uploading a Custom Script from the Enea Edge Management
+        application to a Device</title>
+
+        <programlisting>$ python automation_framework/customScripts/uploadOnDevice.py -c \
+test_success_after_always -e always-after-startup -n inteld1521-6
+2020-04-14 14:26:26,205 - DEBUG: Started logging
+2020-04-14 14:26:26,206 - INFO: Upload Custom Script on Device
+2020-04-14 14:26:26,251 - DEBUG: Login successful on host '172.24.3.109'
+2020-04-14 14:26:26,252 - DEBUG: Session token is: 28ebcb10-7e4b-11ea-835c-02423a1c239f
+2020-04-14 14:26:26,286 - DEBUG: Found device with name 'inteld1521-6'
+2020-04-14 14:26:26,287 - DEBUG: Upload test_success_after_always to inteld1521-6
+2020-04-14 14:26:26,314 - INFO: Done
+2020-04-14 14:26:26,341 - DEBUG: Logging out and exiting...</programlisting>
+      </section>
+
+      <section id="removing_customscrp_device">
+        <title>Removing a Custom Script from a Device</title>
+
+        <programlisting>$ python automation_framework/customScripts/deleteOnDevice.py -c \
+test_success_after_always -e always-after-startup -n inteld1521-6
+2020-04-14 14:33:52,288 - DEBUG: Started logging
+2020-04-14 14:33:52,288 - INFO: Delete Custom Script on Device
+2020-04-14 14:33:52,327 - DEBUG: Login successful on host '172.24.3.109'
+2020-04-14 14:33:52,327 - DEBUG: Session token is: 32cde4f0-7e4c-11ea-835c-02423a1c239f
+2020-04-14 14:33:52,349 - DEBUG: Found device with name 'inteld1521-6'
+2020-04-14 14:33:52,349 - DEBUG: Delete test_success_after_always, \
+phase always-after-startup from inteld1521-6
+2020-04-14 14:33:52,373 - INFO: Done
+2020-04-14 14:33:52,391 - DEBUG: Logging out and exiting...</programlisting>
+      </section>
+
+      <section id="remove_customscrp_ucpemg">
+        <title>Removing a Custom Script from the Enea Edge Management
+        application</title>
+
+        <programlisting>$ python automation_framework/customScripts/delete.py -c \
+test_success_after_always -e always-after-startup
+2020-04-14 14:39:22,042 - DEBUG: Started logging
+2020-04-14 14:39:22,042 - INFO: Delete Custom Script on uCPE Manager
+2020-04-14 14:39:22,081 - DEBUG: Login successful on host '172.24.3.109'
+2020-04-14 14:39:22,082 - DEBUG: Session token is: f75a83a0-7e4c-11ea-835c-02423a1c239f
+2020-04-14 14:39:22,099 - DEBUG: Found custom script: 'test_success_after_always'
+2020-04-14 14:39:22,099 - DEBUG: Delete script test_success_after_always, \
+phase always-after-startup from uCPE Manager
+2020-04-14 14:39:22,118 - INFO: Done
+2020-04-14 14:39:22,135 - DEBUG: Logging out and exiting...</programlisting>
+      </section>
+    </section>
+
     <section id="add_offline_config_store">
       <title>Adding an Offline Configuration Store</title>
 
-      <para>Steps and options on how to add a Config Store in the Enea uCPE
-      Manager are described below.</para>
+      <para>Steps and options on how to add a Config Store in the Enea Edge
+      Management application are described below.</para>
 
       <section id="script_opts_add_config_store">
         <title>Script Options</title>
 
-        <para>To add a config store in the Enea uCPE Manager use the
-        <filename>addConfigStore.py</filename> script detailed below. Bear in
-        mind a <filename>CONFIGSTORE</filename> json file is needed to
+        <para>To add a config store in the Enea Edge Management application
+        use the <filename>addConfigStore.py</filename> script detailed below.
+        Bear in mind a <filename>CONFIGSTORE</filename> json file is needed to
         successfully run the script in order to add an offline configuration
         store.</para>
       </section>
@@ -2430,7 +2578,7 @@ phase always-after-startup from inteld1521-6
 
         <programlisting>{
  "descr": "intelc3850-2",
- "version": "2.3.0",
+ "version": "2.4.0",
  "deviceGroupingTags": "",
  "deviceId": "intelc3850-2",
  "name": "intelc3850-2"
@@ -2440,8 +2588,8 @@ phase always-after-startup from inteld1521-6
       <section id="runpy_add_config_store">
         <title>Running the Python Module</title>
 
-        <para>Adding an offline config store in the Enea uCPE Manager using
-        the command line:</para>
+        <para>Adding an offline config store in the Enea Edge Management
+        application using the command line:</para>
 
         <programlisting>python automation_framework/device/addConfigStore.py -f \
 lab_config/inteld1521-16/store.json
@@ -2544,18 +2692,18 @@ Options:
     </section>
 
     <section id="remove_offline_config_store">
-      <title>Removing an Offline Configuration Store in the Enea uCPE
-      Manager</title>
+      <title>Removing an Offline Configuration Store in the Enea Edge
+      Management application</title>
 
       <para>Steps and options on how to remove an upload of a Config Store
-      from the uCPE Manager are described below.</para>
+      from the Enea Edge Management application are described below.</para>
 
       <note>
         <para>Modifications of an Offline Configurations Store are not
-        possible post deployment in the uCPE Manager, as there is no option
-        for changing script states (e.g. changing the DPDK state in the
-        <filename>configDPDK.py</filename> python script or unbinding
-        interfaces). The offline store must be deleted and the new
+        possible post deployment in the Enea Edge Management application, as
+        there is no option for changing script states (e.g. changing the DPDK
+        state in the <filename>configDPDK.py</filename> python script or
+        unbinding interfaces). The offline store must be deleted and the new
         state(s)/changes added in, before being deployed anew. This was not
         deemed necessary for the current ZTP functionality.</para>
       </note>
@@ -2563,9 +2711,9 @@ Options:
       <section id="script_opts_remove_config_store">
         <title>Script options</title>
 
-        <para>To remove a config store from the uCPE Manager use the
-        <filename>removeConfigStore.py</filename> script detailed
-        below.</para>
+        <para>To remove a config store from the Enea Edge Management
+        application use the <filename>removeConfigStore.py</filename> script
+        detailed below.</para>
 
         <programlisting>python removeConfigStore.py -h
 Usage: removeConfigStore.py [options]
@@ -2636,17 +2784,17 @@ Options:
 
     <para>The <literal>/playbooks</literal> directory contains all the
     implemented Ansible Playbooks. For more details please refer to the <olink
-    targetdoc="book_enea_nfv_access_system_test_specification"
+    targetdoc="book_enea_edge_system_test_specification"
     targetptr="sample_testcases">Sample Test Cases Chapter in the <xi:include
     href="../../s_docbuild/olinkdb/pardoc-names.xml"
     xmlns:xi="http://www.w3.org/2001/XInclude"
-    xpointer="element(book_enea_nfv_access_system_test_specification/1)" /></olink>
+    xpointer="element(book_enea_edge_system_test_specification/1)" /></olink>
     Manual.</para>
 
     <para>The /<literal>uCPEM_config</literal> directory stores JSON
-    configuration files needed for the setup of the uCPE Manager used by TH.
-    One configuration file is needed per uCPE Manager installation, to be used
-    in the TH.</para>
+    configuration files needed for the setup of the Enea Edge Management
+    application used by TH. One configuration file is needed per Enea Edge
+    Management installation, to be used in the TH.</para>
 
     <para>The <literal>/vnf_image</literal> directory stores the VNF Images
     needed by the Ansible Playbooks (i.e. the sample test cases).</para>
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/book.xml b/doc/book-enea-edge-auto-fw-th-user-guide/doc/book.xml
index 0b96de2..d533a74 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/book.xml
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/doc/book.xml
@@ -1,33 +1,32 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED">
 ]>
-<book id="book_enea_nfv_access_auto_fw_th_user_guide">
-  <title><trademark class="registered">Enea</trademark> NFV Access Automation Framework and Test Harness User Guide</title>
+<book id="book_enea_edge_auto_fw_th_user_guide">
+  <title><trademark class="registered">Enea</trademark> Edge Automation
+  Framework and Test Harness User Guide</title>
 
-  <subtitle>Release Version
-         <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
-         xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
+  <subtitle>Release Version <xi:include
+  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xpointer="element(EneaLinux_REL_VER/1)" /></subtitle>
 
   <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
 
   <xi:include href="../../s_docbuild/template/docsrc_common/bookinfo_userdoc.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-  <xi:include href="overview.xml"
-              xmlns:xi="http://www.w3.org/2001/XInclude" />
+  <xi:include href="overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 
   <xi:include href="getting_started.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-  <xi:include href="components.xml"
-                xmlns:xi="http://www.w3.org/2001/XInclude" />
+  <xi:include href="components.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 
   <xi:include href="automation_framework_test_harness.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
 
   <xi:include href="troubleshooting_guide.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-</book>
+</book>
\ No newline at end of file
diff --git a/doc/book-enea-edge-auto-fw-th-user-guide/doc/components.xml b/doc/book-enea-edge-auto-fw-th-user-guide/doc/components.xml
new file mode 100644
index 0000000..94ee384
--- /dev/null
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/doc/components.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="components">
+  <title>Components</title>
+
+  <para>An overview of the Enea Edge Runtime and the Edge Management in
+  cooperation with the Enea Edge Automation Framework and Test Harness, will
+  be presented in detail.</para>
+
+  <figure>
+    <title>Component Overview</title>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" contentwidth="600"
+                   fileref="images/autofw_testh_overview.png" />
+      </imageobject>
+    </mediaobject>
+  </figure>
+
+  <section id="enfva_runtime_plt">
+    <title>Enea Edge</title>
+
+    <para>Enea Edge is comprised of the Enea Edge Management application and
+    Enea Edge Runtime.</para>
+
+    <section id="eucpe_manager">
+      <title>Enea Edge Management</title>
+
+      <para>The Enea Edge Management application needs to be installed on a
+      supported platform. Upon installation, the system will be set up to
+      manage Enea Edge Runtime "devices", these are the virtualized CPE
+      devices used in testing.</para>
+
+      <para>For more on Enea Edge Management installation instructions, please
+      refer to the section on how to <olink
+      targetdoc="book_enea_edge_getting_started"
+      targetptr="install_ucpe_mg">Installing the Enea Edge Management
+      application in the <xi:include
+      href="../../s_docbuild/olinkdb/pardoc-names.xml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xpointer="element(book_enea_edge_getting_started/1)" /></olink>
+      Manual.</para>
+    </section>
+
+    <section id="ena_plat">
+      <title>Enea Edge Runtime</title>
+
+      <para>One or more uCPE devices running the Enea Edge Runtime are
+      required as hosts to run the VNF(s). The uCPE device is known to the
+      Enea Edge Management application as the "VcpeAgent" device
+      module.</para>
+
+      <note>
+        <para>Before running any use case with the Enea Edge Automation
+        Framework and Test Harness, make sure the uCPE device(s) have been
+        added to the Enea Edge Management application.</para>
+      </note>
+
+      <para>Adding a VcpeAgent device can be done via two methods:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>Through the Enea Edge Management GUI. Add the device using the
+          appropriate parameters by launching the UI under
+          <literal>Devices</literal> -&gt; <literal>Manage</literal> in the
+          main screen.</para>
+        </listitem>
+
+        <listitem>
+          <para>REST API. Invoke the Enea Edge Management REST API to add a
+          device.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>For more on Enea Edge installation instructions, please refer to
+      chapter <olink targetdoc="book_enea_edge_getting_started"
+      targetptr="prep_usb_ena">Preparing the USB stick for installation of the
+      Enea Edge Runtime in the <xi:include
+      href="../../s_docbuild/olinkdb/pardoc-names.xml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xpointer="element(book_enea_edge_getting_started/1)" /></olink>
+      Manual.</para>
+    </section>
+  </section>
+
+  <section id="automation">
+    <title>Automation Framework</title>
+
+    <para>Testing can be performed by running Automation Framework (AF) Python
+    scripts against the Enea Edge Management REST API (Python samples
+    supplied). This can be done by using the Python scripts individually or by
+    using the Python unit-test suite that is able to automatically run
+    test-cases defined for each available Python script.</para>
+
+    <para>In either case, it is desirable to use a different host (instead of
+    running the tests on the same system as the Enea Edge Management
+    application) in order to ensure that the Enea Edge Management application
+    is setup and installed correctly in terms of allowing external users to
+    access it and use it effectively.</para>
+  </section>
+
+  <section id="harness">
+    <title>Test Harness</title>
+
+    <para>The Test Harness (TH) provides a way for driving configuration with
+    Ansible Playbooks, by running the python modules from the Automation
+    Framework and by direct connection over SSH to the boards that run Enea
+    Edge.</para>
+
+    <para>The Test Harness includes an automated test suite that
+    contains:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>VNF, Device and Network Smoke Test Cases. A sample test suite
+        that acts as basic smoke tests for Enea Edge and also as a
+        sanity-check test suite for the AF and TH.</para>
+      </listitem>
+
+      <listitem>
+        <para>VNF Deployment and Lifecycle. A sample test suite that verifies
+        the instantiation, lifecycle control and destruction of a VNF for Enea
+        Edge.</para>
+      </listitem>
+
+      <listitem>
+        <para>Service Creation and Lifecycle. A sample test suite that
+        contains complex test cases showcasing service creation and lifecycle
+        management.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>For details about the test suites or test cases please refer to
+    chapter <olink targetdoc="book_enea_edge_system_test_specification"
+    targetptr="sample_testcases">Sample Test Cases in the <xi:include
+    href="../../s_docbuild/olinkdb/pardoc-names.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xpointer="element(book_enea_edge_system_test_specification/1)" /></olink>
+    Manual.</para>
+  </section>
+</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/getting_started.xml b/doc/book-enea-edge-auto-fw-th-user-guide/doc/getting_started.xml
index 4a3fb31..255138b 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/getting_started.xml
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/doc/getting_started.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="getting_started">
-  <title>Getting Started with the Automation Framework and Test
+  <title>Getting Started with the Enea Edge Automation Framework and Test
   Harness</title>
 
   <section id="prerequisites">
     <title>Prerequisites</title>
 
-    <para>For installation of the Automation Framework and Test Harness a
-    CentOS 7 host machine is needed with support for:</para>
+    <para>For installation of the Enea Edge Automation Framework and Test
+    Harness a CentOS 7 host machine is needed with support for:</para>
 
     <itemizedlist>
       <listitem>
@@ -28,14 +28,14 @@
     </itemizedlist>
 
     <note>
-      <para>The Automation Framework and Test Harness installation may be done
-      on the same machine used for uCPE Manager installation, although this is
-      not encouraged. For more details see section <olink
-      targetdoc="book_enea_nfv_access_auto_fw_th_user_guide"
+      <para>The Enea Edge Automation Framework and Test Harness installation
+      may be done on the same machine used for the Enea Edge Management
+      installation, although this is not encouraged. For more details see
+      section <olink targetdoc="book_enea_edge_auto_fw_th_user_guide"
       targetptr="automation">Automation Framework in the <xi:include
       href="../../s_docbuild/olinkdb/pardoc-names.xml"
       xmlns:xi="http://www.w3.org/2001/XInclude"
-      xpointer="element(book_enea_nfv_access_auto_fw_th_user_guide/1)" /></olink>.</para>
+      xpointer="element(book_enea_edge_auto_fw_th_user_guide/1)" /></olink>.</para>
     </note>
   </section>
 
@@ -52,12 +52,11 @@
           </imageobject>
         </mediaobject>
       </figure>The following enviroment setup is needed for running all tests
-    defined in the <olink targetdoc="book_enea_nfv_access_getting_started"
-    targetptr="install_ucpe_mg">Installing the Enea uCPE Manager in the
-    <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
+    defined in the <xi:include
+    href="../../s_docbuild/olinkdb/pardoc-common.xml"
     xmlns:xi="http://www.w3.org/2001/XInclude"
-    xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
-    manual:</para>
+    xpointer="element(book_enea_edge_system_test_specification/1)" />
+    Manual:</para>
 
     <para><emphasis role="bold">Lab Network
     Requirements</emphasis><itemizedlist spacing="compact">
@@ -70,7 +69,7 @@
         </listitem>
       </itemizedlist></para>
 
-    <para><emphasis role="bold">uCPE Manager Host
+    <para><emphasis role="bold">Enea Edge Management Host
     Requirements</emphasis></para>
 
     <itemizedlist spacing="compact">
@@ -83,15 +82,16 @@
       </listitem>
 
       <listitem>
-        <para>uCPE Manager installed.</para>
+        <para>Enea Edge Management application installed.</para>
 
         <note>
-          <para>For details on how to install the uCPE Manager, see <olink
-          targetdoc="book_enea_nfv_access_getting_started"
-          targetptr="install_ucpe_mg">Installing the Enea uCPE Manager in the
-          <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
+          <para>For details on how to install the Enea Edge Management
+          application, see <olink targetdoc="book_enea_edge_getting_started"
+          targetptr="install_ucpe_mg">Installing the Enea Edge Management
+          application in the <xi:include
+          href="../../s_docbuild/olinkdb/pardoc-names.xml"
           xmlns:xi="http://www.w3.org/2001/XInclude"
-          xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
+          xpointer="element(book_enea_edge_getting_started/1)" /></olink>
           Manual.</para>
         </note>
       </listitem>
@@ -112,16 +112,16 @@
         </listitem>
 
         <listitem>
-          <para>Enea NFV Access Runtime Platform installed.</para>
+          <para>Enea Edge Runtime installed.</para>
 
           <note>
-            <para>For information on how to install Enea NFV Access refer to
-            <olink targetdoc="book_enea_nfv_access_getting_started"
+            <para>For information on how to install Enea Edge Runtime refer to
+            <olink targetdoc="book_enea_edge_getting_started"
             targetptr="prep_usb_ena">Preparing the USB stick for installation
-            of the Enea NFV Access Runtime Platform in the <xi:include
+            of the Enea Edge Runtime in the <xi:include
             href="../../s_docbuild/olinkdb/pardoc-names.xml"
             xmlns:xi="http://www.w3.org/2001/XInclude"
-            xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
+            xpointer="element(book_enea_edge_getting_started/1)" /></olink>
             Manual.</para>
           </note>
         </listitem>
@@ -156,7 +156,7 @@
         </listitem>
 
         <listitem>
-          <para>Enea NFV Access Runtime Platform installed.</para>
+          <para>Enea Edge Runtime installed.</para>
         </listitem>
       </itemizedlist></para>
   </section>
@@ -167,7 +167,7 @@
     <orderedlist>
       <listitem>
         <para>Unzip the
-        <filename>Enea_NFV_Access_AF-TH_&lt;version&gt;-build&lt;build_number&gt;.zip</filename>
+        <filename>Enea_Edge_AF-TH_&lt;version&gt;-build&lt;build_number&gt;.zip</filename>
         archive file, provided by Enea, on a supported host machine.</para>
 
         <para>The directory in which the archive has been unpacked will be
@@ -181,11 +181,12 @@
       </listitem>
 
       <listitem>
-        <para>Set up the uCPE Manager which will be used by the TH:</para>
+        <para>Set up the Enea Edge Management application which will be used
+        by the TH:</para>
 
         <orderedlist spacing="compact">
           <listitem>
-            <para>Create the uCPE Manager JSON config file in the
+            <para>Create the Enea Edge Management JSON config file in the
             <literal>&lt;AF-TH-install-dir&gt;/uCPEM_config/</literal>
             directory:<programlisting>{
 "ucpe_usr":"uCPE Manager Username",
@@ -222,18 +223,18 @@
     <literal>&lt;AF-THinstall-dir&gt;</literal> directory.</para>
 
     <para>Subsequent use of the installation requires activating the Python
-    virtual enviroment before using the Automation Framework and Test Harness:
-    <literal>source
+    virtual enviroment before using the Enea Edge Automation Framework and
+    Test Harness: <literal>source
     &lt;AF-TH-install-dir&gt;/testHarness-venv/bin/activate</literal>.</para>
 
-    <para>Furthermore, if a user wants to use a new uCPE Manager instance for
-    a new session, the user also has to re-run the
+    <para>Furthermore, if a user wants to use a new Enea Edge Management
+    instance for a new session, the user also has to re-run the
     <filename>setupuCPEManager.yml</filename> playbook with the corresponding
-    JSON config for the new uCPE Manager instance.</para>
+    JSON config for the new Enea Edge Management instance.</para>
 
     <note>
-      <para>Automation Framework and Test Harness History Information can be
-      found in the AF&amp;TH CHANGELOG file available in:
+      <para>Enea Edge Automation Framework and Test Harness History
+      Information can be found in the AF&amp;TH CHANGELOG file available in:
       <filename>&lt;AF-TH-install-dir&gt;/CHANGELOG</filename></para>
     </note>
   </section>
diff --git a/doc/book-enea-edge-auto-fw-th-user-guide/doc/images/ChainedVNFsService_setup.png b/doc/book-enea-edge-auto-fw-th-user-guide/doc/images/ChainedVNFsService_setup.png
new file mode 100755
index 0000000..0329450
--- /dev/null
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/doc/images/ChainedVNFsService_setup.png
diff --git a/doc/book-enea-edge-auto-fw-th-user-guide/doc/images/autofw_testh_overview.png b/doc/book-enea-edge-auto-fw-th-user-guide/doc/images/autofw_testh_overview.png
new file mode 100755
index 0000000..a384877
--- /dev/null
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/doc/images/autofw_testh_overview.png
diff --git a/doc/book-enea-edge-auto-fw-th-user-guide/doc/images/environment_basicsetup.png b/doc/book-enea-edge-auto-fw-th-user-guide/doc/images/environment_basicsetup.png
new file mode 100755
index 0000000..c30dcfd
--- /dev/null
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/doc/images/environment_basicsetup.png
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/overview.xml b/doc/book-enea-edge-auto-fw-th-user-guide/doc/overview.xml
index eadc1d5..1d07512 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/overview.xml
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/doc/overview.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="overview">
   <title>Overview</title>
 
-  <para>This document describes the Automation Framework and Test Harness for
-  Enea NFV Access, along with instructions regarding the necessary steps to
-  run these software tools.</para>
+  <para>This document describes the Enea Edge Automation Framework and Test
+  Harness, along with instructions regarding the necessary steps to run these
+  software tools.</para>
 
   <section id="descrip">
     <title>Description</title>
 
     <para>The Automation Framework provides a way for driving configuration
-    with Python scripting. It complements the Enea uCPE Manager GUI and uses
-    the northbound REST APIs, given to provide full usability of the Enea uCPE
-    Manager features.</para>
+    with Python scripting. It complements the Enea Edge Management GUI and
+    uses the northbound REST APIs, given to provide full usability of the Enea
+    Management features.</para>
 
     <para>The Test Harness is based on running Ansible Playbooks to complete
     different test cases, which make use of the Automation Framework Python
-    modules and/or direct commands on the uCPE devices running the Enea NFV
-    Access Runtime Platform.</para>
+    modules and/or direct commands on the uCPE devices running the Enea Edge
+    Runtime.</para>
   </section>
 
   <section id="def_acro">
@@ -39,10 +39,9 @@
 
         <tbody>
           <row>
-            <entry>Enea NFV Access</entry>
+            <entry>Enea Edge</entry>
 
-            <entry>The Enea NFV Access (with ODM) Runtime Platform and the
-            Enea uCPE Manager.</entry>
+            <entry>The Enea Edge Runtime and the Enea Edge Management.</entry>
           </row>
         </tbody>
       </tgroup>
@@ -66,7 +65,7 @@
           <row>
             <entry>AF</entry>
 
-            <entry>Automation Framework for Enea NFV Access.</entry>
+            <entry>Automation Framework for Enea Edge.</entry>
           </row>
 
           <row>
@@ -130,12 +129,6 @@
           </row>
 
           <row>
-            <entry>ODM</entry>
-
-            <entry>Enea Element On Device Management.</entry>
-          </row>
-
-          <row>
             <entry>OVS</entry>
 
             <entry>Open vSwitch.</entry>
@@ -162,11 +155,11 @@
           <row>
             <entry>TH</entry>
 
-            <entry>Test Harness for Enea NFV Access.</entry>
+            <entry>Test Harness for Enea Edge.</entry>
           </row>
 
           <row>
-            <entry>uCPE Manager</entry>
+            <entry>Enea Edge Management</entry>
 
             <entry>Enea Universal Customer Premises Equipment Manager.</entry>
           </row>
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/troubleshooting_guide.xml b/doc/book-enea-edge-auto-fw-th-user-guide/doc/troubleshooting_guide.xml
index f51fe11..1ed4d92 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/troubleshooting_guide.xml
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/doc/troubleshooting_guide.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="troubleshooting_guide">
   <title>Troubleshooting Guide</title>
 
@@ -21,12 +21,12 @@
     </listitem>
 
     <listitem>
-      <para>When setting up the uCPE Manager to be used by the TH through the
-      <literal>setupuCPEManager.yml</literal> Playbook, if the uCPE
-      username/password/host are incorrect or are missing, all the Sample test
-      cases will fail. If the FTP username/password/port are wrong or are
-      missing, the tests that require file transfer to the uCPE Manager will
-      fail.</para>
+      <para>When setting up the Enea Edge Management application to be used by
+      the TH through the <literal>setupuCPEManager.yml</literal> Playbook, if
+      the uCPE username/password/host are incorrect or are missing, all the
+      Sample test cases will fail. If the FTP username/password/port are wrong
+      or are missing, the tests that require file transfer to the Enea Edge
+      Management application will fail.</para>
     </listitem>
 
     <listitem>
diff --git a/doc/book-enea-nfv-access-auto-fw-th-open-source/swcomp.mk b/doc/book-enea-edge-auto-fw-th-user-guide/swcomp.mk
index 2f2e677..d17c2b3 100644..100755
--- a/doc/book-enea-nfv-access-auto-fw-th-open-source/swcomp.mk
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/swcomp.mk
@@ -5,6 +5,6 @@ BOOK_VER ?= $(REL_VER)-dev
 
 DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
 
-BOOKPACKAGES := book-enea-nfv-access-auto-fw-th-open-source
-BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access $(PROD_VER) AF&TH Open Source Report"
+BOOKPACKAGES := book-enea-edge-auto-fw-th-user-guide
+BOOKDESC_$(BOOKPACKAGES) := "Enea Enea Edge $(PROD_VER) Automation Framework and Test Harness User Guide"
 BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/128t_vnf_router.xml b/doc/book-enea-edge-example-usecases/doc/128t_vnf_router.xml
index 7ba8a7b..993da22 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/128t_vnf_router.xml
+++ b/doc/book-enea-edge-example-usecases/doc/128t_vnf_router.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="vnf_router_cust_uc">
   <title>128T VNF Router Example Use-case</title>
 
@@ -68,8 +68,9 @@
       <para><emphasis role="bold">Configuring Network Interfaces on uCPE
       devices:</emphasis><orderedlist>
           <listitem>
-            <para>Add the trgt uCPE device into the uCPE Manager:
-            <literal>Devices -&gt; Manage -&gt; Add</literal>.</para>
+            <para>Add the trgt uCPE device into the Enea Edge Management
+            application: <literal>Devices -&gt; Manage -&gt;
+            Add</literal>.</para>
 
             <para>Fill in the required fields with the following data:</para>
 
@@ -266,8 +267,8 @@
                     <entry>Create</entry>
 
                     <entry><para>The system will automatically select the
-                    physical interface that has access to the uCPE
-                    Manager.</para></entry>
+                    physical interface that has access to Enea Edge
+                    Management.</para></entry>
                   </row>
                 </tbody>
               </tgroup>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/appendix_1.xml b/doc/book-enea-edge-example-usecases/doc/appendix_1.xml
index df262af..8c76884 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/appendix_1.xml
+++ b/doc/book-enea-edge-example-usecases/doc/appendix_1.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <appendix id="appendix_one_cust">
   <title>How to create a 128T cloud-init iso image (day-0
   configuration)</title>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/appendix_2.xml b/doc/book-enea-edge-example-usecases/doc/appendix_2.xml
index 2458d99..7ef7c41 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/appendix_2.xml
+++ b/doc/book-enea-edge-example-usecases/doc/appendix_2.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <appendix id="appendix_two_cust">
   <title>How to create the 128T image for NFV Access</title>
 
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/appendix_3.xml b/doc/book-enea-edge-example-usecases/doc/appendix_3.xml
index e8bd5ce..063483a 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/appendix_3.xml
+++ b/doc/book-enea-edge-example-usecases/doc/appendix_3.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <appendix id="appendix_three_cust">
   <title>How to configure Fortigate VNF (day-0 configuration)</title>
 
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/appendix_4.xml b/doc/book-enea-edge-example-usecases/doc/appendix_4.xml
index 9fe1b2b..f52e33d 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/appendix_4.xml
+++ b/doc/book-enea-edge-example-usecases/doc/appendix_4.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <appendix id="appendix_four_cust">
-  <title>Running Enea Automation Framework tests</title>
+  <title>Running Enea Edge Automation Framework and Test Harness</title>
 
-  <para>For more detailed information regarding the Automation Framework and
-  Test Harness please see the <xi:include
+  <para>For more detailed information regarding the Enea Edge Automation
+  Framework and Test Harness please see the <xi:include
   href="../../s_docbuild/olinkdb/pardoc-common.xml"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xpointer="element(book_enea_nfv_access_auto_fw_th_user_guide/1)" />.</para>
+  xpointer="element(book_enea_edge_auto_fw_th_user_guide/1)" />.</para>
 
-  <para>The most relevant information from the Automation Framework and Test
-  Harness structure is presented below:</para>
+  <para>The most relevant information from the Enea Edge Automation Framework
+  and Test Harness structure is presented below:</para>
 
   <programlisting>|---automation_framework
 |  |---unittestSuite
@@ -64,7 +64,7 @@
     </listitem>
 
     <listitem>
-      <para><literal>version</literal> - The NFVA version.</para>
+      <para><literal>version</literal> - The Enea Edge Runtime version.</para>
     </listitem>
 
     <listitem>
@@ -78,9 +78,18 @@
 
   <note>
     <para>Before starting the two usecases detailed in the following appendix,
-    the uCPE Device needs to be added into the uCPE Manager.</para>
+    the uCPE Device needs to be added into the Enea Edge Management
+    application.</para>
   </note>
 
+  <para>To properly set up the Enea Edge Automation Framework and Test Harness
+  please see <olink targetdoc="book_enea_edge_auto_fw_th_user_guide"
+  targetptr="initial_setup">Installation and Initial Setup in the <xi:include
+  href="../../s_docbuild/olinkdb/pardoc-names.xml"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xpointer="element(book_enea_edge_auto_fw_th_user_guide/1)" /></olink> for
+  more details.</para>
+
   <para>To run a test:</para>
 
   <programlisting>&gt; cd automation_framework/unittestSuite/
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/appendix_5.xml b/doc/book-enea-edge-example-usecases/doc/appendix_5.xml
index 71dee09..abb4be8 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/appendix_5.xml
+++ b/doc/book-enea-edge-example-usecases/doc/appendix_5.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <appendix id="appendix_five_cust">
-  <title>Example Tests Results using the Automation Framework</title>
+  <title>Example Tests Results using the Automation Framework and Test
+  Harness</title>
 
   <para>In order to run the following example usecases, certain configuration
   file entries need to be modified according to the network setup that it will
@@ -39,8 +40,8 @@
     "maintMode": "false",
     "version": "2.2.3",
     "deviceId": "inteld1521-17"
-}</programlisting>The IP address of the uCPE Manager that will be used in
-  these examples is <literal>172.24.3.92</literal>.</para>
+}</programlisting>The IP address of Enea Edge Management application that will
+  be used in these examples is <literal>172.24.3.92</literal>.</para>
 
   <para>The FortiGate and 128T VNF images need to be copied into the
   <literal>vnf_image</literal> directory. The names should be the same as
@@ -138,7 +139,7 @@ OK</programlisting>
 
   <section id="ap_d_uc2">
     <title>Use-case 2: Service Chaining 128T - Fortigate Example
-    Usecase</title>
+    Use-case</title>
 
     <programlisting>&gt; python unittestSuite.py -u admin -p admin -H 172.24.3.92 -n inteld1521-17 \
 -s 128t_FG_SFCDeploy.json -d "128T - Fortigate SFC Deployment"
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/book.xml b/doc/book-enea-edge-example-usecases/doc/book.xml
index eb8b0c8..fc69b88 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/book.xml
+++ b/doc/book-enea-edge-example-usecases/doc/book.xml
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED">
 ]>
-<book id="book_enea_nfv_access_example_usecases">
-  <title><trademark class="registered">Enea</trademark> NFV Access Example Use-cases</title>
+<book id="book_enea_edge_example_usecases">
+  <title><trademark class="registered">Enea</trademark> Edge Example
+  Use-cases</title>
 
-  <subtitle>Release Version
-         <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
-         xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
+  <subtitle>Release Version <xi:include
+  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xpointer="element(EneaLinux_REL_VER/1)" /></subtitle>
 
   <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
 
@@ -36,9 +38,7 @@
   <xi:include href="service_chaining_128t_fortigate.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-  <xi:include href="appendix_4.xml"
-              xmlns:xi="http://www.w3.org/2001/XInclude" />
+  <xi:include href="appendix_4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-  <xi:include href="appendix_5.xml"
-              xmlns:xi="http://www.w3.org/2001/XInclude" />
-</book>
+  <xi:include href="appendix_5.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</book>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/clav_vnf_examples.xml b/doc/book-enea-edge-example-usecases/doc/clav_vnf_examples.xml
index 57c79b5..80755c2 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/clav_vnf_examples.xml
+++ b/doc/book-enea-edge-example-usecases/doc/clav_vnf_examples.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="clav_vnf_example">
   <title>Clavister VNF Example Use-cases</title>
 
@@ -33,23 +33,33 @@
 
       <itemizedlist>
         <listitem>
-          <para>Enea Test VNF image. Please contact Enea to get this image.</para>
+          <para>Enea Test VNF image. Please contact Enea to get this
+          image.</para>
         </listitem>
 
         <listitem>
           <para>Clavister VNF image. Please contact Clavister to get this
           image.</para>
         </listitem>
-        
-        <listitem><para>VNF Configuration files. These files are provided with your Enea
-        NFV Access release:</para>
-        
-        <itemizedlist spacing="compact">
-          <listitem><para><filename>clavister-cloudinit.conf</filename>.</para></listitem>
-          <listitem><para><filename>enea-vnf-iperf-client.conf</filename>.</para></listitem>
-          <listitem><para><filename>enea-vnf-iperf-server.conf</filename>.</para></listitem>
+
+        <listitem>
+          <para>VNF Configuration files. These files are provided with your
+          Enea Edge release:</para>
+
+          <itemizedlist spacing="compact">
+            <listitem>
+              <para><filename>clavister-cloudinit.conf</filename>.</para>
+            </listitem>
+
+            <listitem>
+              <para><filename>enea-vnf-iperf-client.conf</filename>.</para>
+            </listitem>
+
+            <listitem>
+              <para><filename>enea-vnf-iperf-server.conf</filename>.</para>
+            </listitem>
           </itemizedlist>
-          </listitem>
+        </listitem>
       </itemizedlist>
     </section>
 
@@ -62,22 +72,22 @@
       bridges.</para>
 
       <figure>
-          <title>Clavister VNF using an Open vSwitch bridge</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center" contentwidth="600"
-                         fileref="images/uc_clavister_bridge.png" />
-            </imageobject>
-          </mediaobject>
-        </figure>
-        
-       <note>
-         <para>When connecting, the uCPE devices can use a back-to-back or a VPN connection. 
-           An appropriate interface with the required capabilities needs to be chosen for 
-           this purpose.</para>
-          </note>
-      
+        <title>Clavister VNF using an Open vSwitch bridge</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" contentwidth="600"
+                       fileref="images/uc_clavister_bridge.png" />
+          </imageobject>
+        </mediaobject>
+      </figure>
+
+      <note>
+        <para>When connecting, the uCPE devices can use a back-to-back or a
+        VPN connection. An appropriate interface with the required
+        capabilities needs to be chosen for this purpose.</para>
+      </note>
+
       <para><emphasis role="bold">Network Configuration:</emphasis></para>
 
       <orderedlist>
@@ -324,21 +334,32 @@ root@qemux86-64:~# iperf3 -c 192.168.10.10</programlisting>
 
       <itemizedlist>
         <listitem>
-          <para>Enea Test VNF image. Please contact Enea to get this image.</para>
+          <para>Enea Test VNF image. Please contact Enea to get this
+          image.</para>
         </listitem>
 
         <listitem>
           <para>Clavister VNF image. Please contact Clavister to get this
           image.</para>
         </listitem>
-        
-        <listitem><para>VNF Configuration files. These files are provided with your Enea
-        NFV Access release:</para>
+
+        <listitem>
+          <para>VNF Configuration files. These files are provided with your
+          Enea Edge release:</para>
+
           <itemizedlist spacing="compact">
-            <listitem><para><filename>clavister-cloudinit.conf</filename>.</para></listitem>
-            <listitem><para><filename>enea-vnf-iperf-client.conf</filename>.</para></listitem>
-            <listitem><para><filename>enea-vnf-iperf-server.conf</filename>.</para></listitem>
-          </itemizedlist>  
+            <listitem>
+              <para><filename>clavister-cloudinit.conf</filename>.</para>
+            </listitem>
+
+            <listitem>
+              <para><filename>enea-vnf-iperf-client.conf</filename>.</para>
+            </listitem>
+
+            <listitem>
+              <para><filename>enea-vnf-iperf-server.conf</filename>.</para>
+            </listitem>
+          </itemizedlist>
         </listitem>
       </itemizedlist>
     </section>
@@ -367,8 +388,9 @@ root@qemux86-64:~# iperf3 -c 192.168.10.10</programlisting>
         <listitem>
           <para>Select uCPE device 1, access <literal>Configuration</literal>,
           add the network interface that will be used and configure it for
-          SR-IOV. For <literal>sriov-mode</literal> select <literal>adapter-pool</literal> and for 
-            <literal>sriov-num-vfs</literal> select "2".</para>
+          SR-IOV. For <literal>sriov-mode</literal> select
+          <literal>adapter-pool</literal> and for
+          <literal>sriov-num-vfs</literal> select "2".</para>
         </listitem>
 
         <listitem>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/enea_test_vnf_examples.xml b/doc/book-enea-edge-example-usecases/doc/enea_test_vnf_examples.xml
index 1f10dbf..0c3815e 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/enea_test_vnf_examples.xml
+++ b/doc/book-enea-edge-example-usecases/doc/enea_test_vnf_examples.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter condition="hidden" id="enea_vnf_examples">
   <title>Enea Test VNF Example Use-cases</title>
 
@@ -17,8 +17,8 @@
 
     <itemizedlist>
       <listitem>
-        <para>2 Network Interfaces. One for the uCPE manager and one for data
-        traffic.</para>
+        <para>2 Network Interfaces. One for the Enea Edge Management
+        application and one for data traffic.</para>
       </listitem>
 
       <listitem>
@@ -35,7 +35,7 @@
       </listitem>
 
       <para>VNF Configuration files. These files are provided with your Enea
-      NFV Access release:</para>
+      Edge release:</para>
 
       <listitem>
         <para><filename>enea-vnf-testpmd-fwd.conf</filename>.</para>
@@ -134,7 +134,7 @@
 
       <orderedlist>
         <listitem>
-          <para>Instantiate the Enea NFV Access TestPMD forwarding VNF on uCPE
+          <para>Instantiate the Enea Edge TestPMD forwarding VNF on uCPE
           Device 2 by filling the required fields with the following
           values:</para>
 
@@ -168,8 +168,8 @@
         </listitem>
 
         <listitem>
-          <para>Instantiate the Enea NFV Access TestPMD termination VNF on
-          uCPE Device 2 by filling the required fields with the following
+          <para>Instantiate the Enea Edge TestPMD termination VNF on uCPE
+          Device 2 by filling the required fields with the following
           values:</para>
 
           <itemizedlist spacing="compact">
@@ -218,8 +218,8 @@
           <literal>testpmd_term</literal>.</para>
 
           <note>
-            <para>The flow rules can be described using either the uCPE
-            manager interface or the configuration files.</para>
+            <para>The flow rules can be described using either the Enea Edge
+            Management interface or the configuration files.</para>
           </note>
         </listitem>
       </itemizedlist>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml b/doc/book-enea-edge-example-usecases/doc/forti_vnf_examples.xml
index 36c7114..cc3be97 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml
+++ b/doc/book-enea-edge-example-usecases/doc/forti_vnf_examples.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="vnf_fortigate">
   <title>FortiGate VNF Example Use-cases</title>
 
@@ -15,11 +15,11 @@
     running FortiGate Management traffic over WAN.</para>
 
     <para>Instructions on how to alter the default configuration are provided
-    in section <olink targetdoc="book_enea_nfv_access_example_usecases"
+    in section <olink targetdoc="book_enea_edge_example_usecases"
     targetptr="fortigate_webmg">FortiGate VNF Web Management in the
     <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
     xmlns:xi="http://www.w3.org/2001/XInclude"
-    xpointer="element(book_enea_nfv_access_example_usecases/1)" /></olink>
+    xpointer="element(book_enea_edge_example_usecases/1)" /></olink>
     Manual.</para>
 
     <section id="forti_firewall_prereq">
@@ -50,7 +50,7 @@
         </listitem>
 
         <listitem>
-          <para>VNF Configuration file(s), provided with your Enea NFV Access
+          <para>VNF Configuration file(s), provided with your Enea Edge
           release: <filename>fortigate-basic-fw.conf</filename>.</para>
         </listitem>
       </itemizedlist>
@@ -93,7 +93,7 @@
         </listitem>
 
         <listitem>
-          <para>Connect ETH0 to the Lab Network (for Enea uCPE Manager
+          <para>Connect ETH0 to the Lab Network (for Enea Edge Management
           communications).</para>
         </listitem>
 
@@ -250,12 +250,12 @@
       <para>The FortiGate VNF management interface is accessible through the
       WAN interface. The WAN IP address can be used from a web browser on the
       Lab Machine to access the FortiGate VNF Management Web UI. See section
-      <olink targetdoc="book_enea_nfv_access_example_usecases"
+      <olink targetdoc="book_enea_edge_example_usecases"
       targetptr="fortigate_webmg">FortiGate VNF web management in the
       <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
       xmlns:xi="http://www.w3.org/2001/XInclude"
-      xpointer="element(book_enea_nfv_access_example_usecases/1)" /></olink>
-      Manual for more information.</para>
+      xpointer="element(book_enea_edge_example_usecases/1)" /></olink> Manual
+      for more information.</para>
     </section>
   </section>
 
@@ -302,7 +302,7 @@
         </listitem>
 
         <listitem>
-          <para>VNF Configuration file(s), provided with your Enea NFV Access
+          <para>VNF Configuration file(s), provided with your Enea Edge
           release: <filename>fortigate-sdwan&lt;x&gt;.conf</filename>.</para>
         </listitem>
       </itemizedlist>
@@ -359,7 +359,7 @@
 
         <listitem>
           <para>Connect the <literal>ETH0</literal> interfaces to the Lab
-          Network (for Enea uCPE Manager communications).</para>
+          Network (for Enea Edge Management communications).</para>
         </listitem>
 
         <listitem>
@@ -533,11 +533,11 @@
       device 2</literal> in this setup, over the WAN connection. The FortiGate
       VNF management interface can be accessed from a web browser on the Lab
       Machine. For more details please see <olink
-      targetdoc="book_enea_nfv_access_example_usecases"
+      targetdoc="book_enea_edge_example_usecases"
       targetptr="fortigate_webmg">FortiGate VNF Web Management, <xi:include
       href="../../s_docbuild/olinkdb/pardoc-names.xml"
       xmlns:xi="http://www.w3.org/2001/XInclude"
-      xpointer="element(book_enea_nfv_access_example_usecases/1)" /></olink>.</para>
+      xpointer="element(book_enea_edge_example_usecases/1)" /></olink>.</para>
 
       <note>
         <para>In this SD-WAN VPN setup example, bridges were used as
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/fortinet_interface.png b/doc/book-enea-edge-example-usecases/doc/images/fortinet_interface.png
index 9452264..9452264 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/fortinet_interface.png
+++ b/doc/book-enea-edge-example-usecases/doc/images/fortinet_interface.png
diff --git a/doc/book-enea-edge-example-usecases/doc/images/trgt.png b/doc/book-enea-edge-example-usecases/doc/images/trgt.png
new file mode 100644
index 0000000..2977524
--- /dev/null
+++ b/doc/book-enea-edge-example-usecases/doc/images/trgt.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt.svg b/doc/book-enea-edge-example-usecases/doc/images/trgt.svg
index d933a63..86f4d12 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt.svg
+++ b/doc/book-enea-edge-example-usecases/doc/images/trgt.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -15,9 +13,9 @@
    viewBox="0 0 291.36588 156.51978"
    version="1.1"
    id="svg1125"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   inkscape:version="1.0.2 (e86c870, 2021-01-15)"
    sodipodi:docname="trgt.svg"
-   inkscape:export-filename="L:\docu_work\nfv-access-documentation\doc\book-enea-nfv-access-example-usecases\doc\images\trgt.png"
+   inkscape:export-filename="D:\ENEA Work files\ENFV work\ENA 2.4\AP-636\trgt.png"
    inkscape:export-xdpi="65"
    inkscape:export-ydpi="65">
   <defs
@@ -522,13 +520,13 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.62"
-     inkscape:cx="560.05537"
-     inkscape:cy="285.57838"
+     inkscape:cx="510.81788"
+     inkscape:cy="354.91926"
      inkscape:document-units="mm"
      inkscape:current-layer="layer2"
      showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="713"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
@@ -539,7 +537,8 @@
      fit-margin-right="0"
      fit-margin-bottom="0"
      inkscape:showpageshadow="false"
-     showborder="false" />
+     showborder="false"
+     inkscape:document-rotation="0" />
   <metadata
      id="metadata1122">
     <rdf:RDF>
@@ -590,9 +589,9 @@
          id="text6066"
          y="68.725212"
          x="168.60965"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:8.46666622px;stroke-width:0.26458332"
+           style="font-size:8.46667px;stroke-width:0.264583"
            y="68.725212"
            x="168.60965"
            id="tspan6064"
@@ -611,9 +610,9 @@
        id="text892"
        y="193.61693"
        x="311.6983"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        xml:space="preserve"><tspan
-         style="font-size:8.46666622px;writing-mode:lr-tb;stroke-width:0.26458332"
+         style="font-size:8.46667px;writing-mode:lr-tb;stroke-width:0.264583"
          y="193.61693"
          x="311.6983"
          id="tspan890"
@@ -698,7 +697,7 @@
            inkscape:connector-curvature="0" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;filter:url(#filter4332-4)"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;filter:url(#filter4332-4)"
            x="-0.59244788"
            y="284.13779"
            id="text4338"
@@ -706,32 +705,30 @@
              sodipodi:role="line"
              x="-0.59244788"
              y="284.13779"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4344">Legend: </tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="307.47113"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4348">- Connection via cloud/internet:</tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="330.80444"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4350">- Back to Back: BTB</tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="354.13779"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4651">- Flow rules: </tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="377.47113"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4340" /><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="400.80444"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4342" /></text>
       </g>
     </g>
@@ -752,20 +749,16 @@
            height="25.079741"
            x="872"
            y="137.70079" /></flowRegion><flowPara
-         id="flowPara955" /></flowRoot>    <text
+         id="flowPara955" /></flowRoot>
+    <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="253.30237"
        y="127.42318"
-       id="text947"><tspan
-         sodipodi:role="line"
-         id="tspan945"
-         x="253.30237"
-         y="133.14297"
-         style="font-size:5.64444447px;writing-mode:lr-tb;stroke-width:0.26458332" /></text>
+       id="text947" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;filter:url(#filter4332-7)"
+       style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;filter:url(#filter4332-7)"
        x="77.070297"
        y="140.22328"
        id="text4180-4"><tspan
@@ -773,7 +766,7 @@
          id="tspan4178-0"
          x="77.070297"
          y="140.22328"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332">uCPE Device</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583">uCPE Device</tspan></text>
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.60000001, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1"
        d="m 266.39304,242.05073 -5.00906,-38.32387"
@@ -797,45 +790,40 @@
          id="text6011-4"
          y="367.05307"
          x="37.059994"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05555534px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:7.05555534px;stroke-width:0.26458332"
+           style="font-size:7.05556px;stroke-width:0.264583"
            y="367.05307"
            x="37.059994"
            id="tspan6009-5"
            sodipodi:role="line">Internet</tspan></text>
     </g>
     <g
-       transform="translate(229.03004,198.99263)"
-       id="g6108">
-      <g
-         id="g1117"
-         transform="translate(0,-6.3500003)">
-        <rect
-           style="fill:#ff9955;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.30122805;stroke-opacity:1"
-           id="rect5992"
-           width="54.967422"
-           height="32.516785"
-           x="8.4991493"
-           y="49.31292"
-           rx="5.9960117" />
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-           x="35.614925"
-           y="62.470726"
-           id="text5996"><tspan
-             sodipodi:role="line"
-             id="tspan5994"
-             x="35.614925"
-             y="62.470726"
-             style="stroke-width:0.26458332">uCPE</tspan><tspan
-             sodipodi:role="line"
-             x="35.614925"
-             y="73.054062"
-             style="stroke-width:0.26458332"
-             id="tspan5998">Manager</tspan></text>
-      </g>
+       id="g222">
+      <rect
+         style="fill:#ff9955;fill-opacity:0.641414;stroke:#000000;stroke-width:0.301228;stroke-opacity:1"
+         id="rect5992"
+         width="54.967422"
+         height="32.516785"
+         x="237.52919"
+         y="241.95555"
+         rx="5.9960117" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.76111px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         x="264.72488"
+         y="255.32437"
+         id="text5996"><tspan
+           sodipodi:role="line"
+           x="264.72488"
+           y="255.32437"
+           style="font-size:7.76111px;stroke-width:0.264583"
+           id="tspan5998">Enea Edge </tspan><tspan
+           sodipodi:role="line"
+           x="265.80304"
+           y="265.02576"
+           style="font-size:7.76111px;stroke-width:0.264583"
+           id="tspan216">Management </tspan></text>
     </g>
     <rect
        style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.53169465;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.06338919, 0.53169459, 0.2658473, 0.53169459;stroke-dashoffset:0;stroke-opacity:1"
@@ -855,19 +843,19 @@
        rx="7.1185279" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="262.7706"
        y="132.16495"
        id="text6054"><tspan
          sodipodi:role="line"
          x="263.74899"
          y="132.16495"
-         style="font-size:7.05555534px;stroke-width:0.26458332"
+         style="font-size:7.05556px;stroke-width:0.264583"
          id="tspan1505">Web Interface </tspan><tspan
          sodipodi:role="line"
          x="262.7706"
          y="142.74828"
-         style="font-size:4.23333311px;line-height:0;stroke-width:0.26458332"
+         style="font-size:4.23333px;line-height:0;stroke-width:0.264583"
          id="tspan2650">(128T) https://&lt;IP&gt;:60001</tspan></text>
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.60000001, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1"
@@ -888,7 +876,7 @@
          rx="2.0431714" />
       <text
          xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
          x="200.812"
          y="197.64984"
          id="text892-8"><tspan
@@ -896,7 +884,7 @@
            id="tspan890-8"
            x="200.812"
            y="197.64984"
-           style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">ibm_br</tspan></text>
+           style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">ibm_br</tspan></text>
     </g>
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -917,7 +905,7 @@
          rx="2.0431714" />
       <text
          xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
          x="97.733612"
          y="178.01437"
          id="text892-8-9-5"><tspan
@@ -925,7 +913,7 @@
            id="tspan890-8-6-4"
            x="97.733612"
            y="178.01437"
-           style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">lan_br</tspan></text>
+           style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">lan_br</tspan></text>
     </g>
     <g
        id="g2592"
@@ -1022,24 +1010,14 @@
              style="fill:#ac9d93;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.25908634;stroke-opacity:1" />
           <text
              xml:space="preserve"
-             style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+             style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.264583"
              x="53.59409"
              y="60.119961"
-             id="text15008-4"><tspan
-               sodipodi:role="line"
-               id="tspan15006-8"
-               x="53.59409"
-               y="69.483727"
-               style="fill:#ac9d93;stroke-width:0.26458332" /><tspan
-               sodipodi:role="line"
-               x="53.59409"
-               y="82.712898"
-               style="fill:#ac9d93;stroke-width:0.26458332"
-               id="tspan15010-2" /></text>
+             id="text15008-4" />
         </g>
         <text
            xml:space="preserve"
-           style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;filter:url(#filter4332)"
+           style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;filter:url(#filter4332)"
            x="12.285738"
            y="179.02138"
            id="text4180"><tspan
@@ -1047,7 +1025,7 @@
              id="tspan4178"
              x="12.285738"
              y="179.02138"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332">Test Machine</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583">Test Machine</tspan></text>
       </g>
     </g>
     <rect
@@ -1076,9 +1054,9 @@
            id="text892-8-9"
            y="233.89996"
            x="146.69841"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
            xml:space="preserve"><tspan
-             style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975"
+             style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825"
              y="233.89996"
              x="146.69841"
              id="tspan890-8-6"
@@ -1106,35 +1084,30 @@
          id="g2216">
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-opacity:1"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-opacity:1"
            x="152.78181"
            y="190.09128"
            id="text5981"><tspan
              sodipodi:role="line"
              x="152.78181"
              y="190.09128"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-opacity:1"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-opacity:1"
              id="tspan5983">128T</tspan></text>
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-opacity:1"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-opacity:1"
            x="153.08981"
            y="198.8871"
-           id="text5981-9"><tspan
-             sodipodi:role="line"
-             x="153.08981"
-             y="206.51349"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-opacity:1"
-             id="tspan5983-0" /></text>
+           id="text5981-9" />
       </g>
     </g>
     <text
        id="text892-8-9-5-5"
        y="178.40254"
        x="130.10648"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
        xml:space="preserve"><tspan
-         style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975"
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825"
          y="178.40254"
          x="130.10648"
          id="tspan890-8-6-4-2"
@@ -1143,9 +1116,9 @@
        id="text892-8-9-5-5-7"
        y="197.8927"
        x="173.88567"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
        xml:space="preserve"><tspan
-         style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975"
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825"
          y="197.8927"
          x="173.88567"
          id="tspan890-8-6-4-2-5"
@@ -1154,9 +1127,9 @@
        id="text892-8-9-5-5-7-6"
        y="209.60852"
        x="152.23137"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
        xml:space="preserve"><tspan
-         style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975"
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825"
          y="209.60852"
          x="152.23137"
          id="tspan890-8-6-4-2-5-4"
@@ -1190,7 +1163,7 @@
        inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="150.01842"
        y="227.15002"
        id="text2695"><tspan
@@ -1198,10 +1171,10 @@
          id="tspan2693"
          x="150.01842"
          y="227.15002"
-         style="font-size:3.52777767px;writing-mode:lr-tb;stroke-width:0.26458332">.1</tspan></text>
+         style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583">.1</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="150.09465"
        y="214.73219"
        id="text2695-7"><tspan
@@ -1209,10 +1182,10 @@
          id="tspan2693-9"
          x="150.09465"
          y="214.73219"
-         style="font-size:3.52777767px;writing-mode:lr-tb;stroke-width:0.26458332">.2</tspan></text>
+         style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583">.2</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="123.06345"
        y="175.89812"
        id="text2695-5"><tspan
@@ -1220,10 +1193,10 @@
          id="tspan2693-95"
          x="123.06345"
          y="175.89812"
-         style="font-size:3.52777767px;writing-mode:lr-tb;stroke-width:0.26458332">.1</tspan></text>
+         style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583">.1</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="53.247215"
        y="176.16252"
        id="text2695-7-0"><tspan
@@ -1231,10 +1204,10 @@
          id="tspan2693-9-4"
          x="53.247215"
          y="176.16252"
-         style="font-size:3.52777767px;writing-mode:lr-tb;stroke-width:0.26458332">.2</tspan></text>
+         style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583">.2</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="101.91634"
        y="171.6506"
        id="text2770"><tspan
@@ -1242,10 +1215,10 @@
          id="tspan2768"
          x="101.91634"
          y="171.6506"
-         style="writing-mode:lr-tb;stroke-width:0.26458332">192.168.64.0/24</tspan></text>
+         style="writing-mode:lr-tb;stroke-width:0.264583">192.168.64.0/24</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;opacity:0.98999999;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;opacity:0.99;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="141.07509"
        y="221.29282"
        id="text2770-0"><tspan
@@ -1253,6 +1226,6 @@
          id="tspan2768-4"
          x="141.07509"
          y="221.29282"
-         style="writing-mode:lr-tb;stroke-width:0.26458332">10.0.0.0/24</tspan></text>
+         style="writing-mode:lr-tb;stroke-width:0.264583">10.0.0.0/24</tspan></text>
   </g>
 </svg>
diff --git a/doc/book-enea-edge-example-usecases/doc/images/trgt_servicechain.png b/doc/book-enea-edge-example-usecases/doc/images/trgt_servicechain.png
new file mode 100644
index 0000000..7cb5af0
--- /dev/null
+++ b/doc/book-enea-edge-example-usecases/doc/images/trgt_servicechain.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt_servicechain.svg b/doc/book-enea-edge-example-usecases/doc/images/trgt_servicechain.svg
index 931bcaf..4bd6d85 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt_servicechain.svg
+++ b/doc/book-enea-edge-example-usecases/doc/images/trgt_servicechain.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -15,8 +13,11 @@
    viewBox="0 0 291.36588 156.51978"
    version="1.1"
    id="svg1125"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="trgt_servicechain.svg">
+   inkscape:version="1.0.2 (e86c870, 2021-01-15)"
+   sodipodi:docname="trgt_servicechain.svg"
+   inkscape:export-filename="D:\ENEA Work files\ENFV work\ENA 2.4\AP-636\trgt_servicechain.png"
+   inkscape:export-xdpi="65"
+   inkscape:export-ydpi="65">
   <defs
      id="defs1119">
     <marker
@@ -518,14 +519,14 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.58"
-     inkscape:cx="375.51558"
-     inkscape:cy="323.25547"
+     inkscape:zoom="0.82024387"
+     inkscape:cx="392.43009"
+     inkscape:cy="234.25387"
      inkscape:document-units="mm"
      inkscape:current-layer="layer2"
      showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="713"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
@@ -536,7 +537,8 @@
      fit-margin-right="0"
      fit-margin-bottom="0"
      inkscape:showpageshadow="false"
-     showborder="false" />
+     showborder="false"
+     inkscape:document-rotation="0" />
   <metadata
      id="metadata1122">
     <rdf:RDF>
@@ -569,7 +571,7 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="Template Pieces"
-     style="display:inline"
+     style="display:none"
      transform="translate(-1.4460939,-31.103178)">
     <g
        transform="translate(-347.67938,189.67391)"
@@ -581,14 +583,14 @@
          height="18"
          width="45"
          id="rect6062"
-         style="fill:#c48ed1;fill-opacity:1;stroke:#000000;stroke-width:0.26458332;stroke-opacity:1" />
+         style="fill:#c48ed1;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-opacity:1" />
       <text
          id="text6066"
          y="68.725212"
          x="168.60965"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:8.46666622px;stroke-width:0.26458332"
+           style="font-size:8.46667px;stroke-width:0.264583"
            y="68.725212"
            x="168.60965"
            id="tspan6064"
@@ -601,26 +603,26 @@
        height="59.711037"
        width="19.975622"
        id="rect6098"
-       style="fill:#ffd32a;fill-opacity:0.64313725;stroke:#000000;stroke-width:0.28896147;stroke-opacity:1" />
+       style="fill:#ffd32a;fill-opacity:0.643137;stroke:#000000;stroke-width:0.288961;stroke-opacity:1" />
     <text
        transform="rotate(90)"
        id="text892"
        y="193.61693"
        x="311.6983"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        xml:space="preserve"><tspan
-         style="font-size:8.46666622px;writing-mode:lr-tb;stroke-width:0.26458332"
+         style="font-size:8.46667px;writing-mode:lr-tb;stroke-width:0.264583"
          y="193.61693"
          x="311.6983"
          id="tspan890"
          sodipodi:role="line">OVS Bridge</tspan></text>
     <path
-       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.00000003, 0.50000003, 0.25, 0.50000003;stroke-dashoffset:0;stroke-opacity:1"
+       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 0.5, 0.25, 0.5;stroke-dashoffset:0;stroke-opacity:1"
        d="m -149.19921,310.00051 h 34.52812"
        id="path8471"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.00000004, 0.50000003, 0.25, 0.50000003;stroke-dashoffset:0;stroke-opacity:1"
+       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 0.5, 0.25, 0.5;stroke-dashoffset:0;stroke-opacity:1"
        d="M -104.61691,328.32292 V 293.7948"
        id="path8471-3"
        inkscape:connector-curvature="0" />
@@ -635,37 +637,37 @@
        id="path8471-3-2-4"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
+       style="fill:none;stroke:#000000;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
        d="m -142.20667,270.65304 h 37.32518"
        id="path6121"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-9-9)"
+       style="fill:none;stroke:#000000;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-9-9)"
        d="m -142.15413,276.6677 h 37.32519"
        id="path6121-4"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-2-7-1)"
+       style="fill:none;stroke:#000000;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-2-7-1)"
        d="m -99.555704,258.89146 21.35958,30.60942"
        id="path6121-4-7"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-2-1-4-0)"
+       style="fill:none;stroke:#000000;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-2-1-4-0)"
        d="m -53.814264,258.73079 -21.35958,30.60942"
        id="path6121-4-7-5"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-2-4-9-5-1)"
+       style="fill:none;stroke:#000000;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-2-4-9-5-1)"
        d="m -77.254954,275.59103 -21.35958,-30.60942"
        id="path6121-4-7-3-6"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:#777777;fill-opacity:1;stroke:#777777;stroke-width:1.22399998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#EmptyTriangleOutL-6-0)"
+       style="fill:#777777;fill-opacity:1;stroke:#777777;stroke-width:1.224;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#EmptyTriangleOutL-6-0)"
        d="m -144.36842,344.40951 h 22.4813"
        id="path899"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:#d26f6f;fill-opacity:1;stroke:#d26f6f;stroke-width:1.22399998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#EmptyTriangleOutL-0-0-9)"
+       style="fill:#d26f6f;fill-opacity:1;stroke:#d26f6f;stroke-width:1.224;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#EmptyTriangleOutL-0-0-9)"
        d="m -113.08989,344.13177 h 22.481306"
        id="path899-9"
        inkscape:connector-curvature="0" />
@@ -688,13 +690,13 @@
            inkscape:connector-curvature="0" />
         <path
            transform="translate(-3.1511298,-3.7216363)"
-           style="fill:#d26f6f;fill-opacity:1;stroke:#d26f6f;stroke-width:0.59490627;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#EmptyTriangleOutL-0-9-0-3)"
+           style="fill:#d26f6f;fill-opacity:1;stroke:#d26f6f;stroke-width:0.594906;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#EmptyTriangleOutL-0-9-0-3)"
            d="m 108.80427,115.85976 h 10.92006"
            id="path899-9-2"
            inkscape:connector-curvature="0" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;filter:url(#filter4332-4)"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;filter:url(#filter4332-4)"
            x="-0.59244788"
            y="284.13779"
            id="text4338"
@@ -702,39 +704,37 @@
              sodipodi:role="line"
              x="-0.59244788"
              y="284.13779"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4344">Legend: </tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
-             y="307.47113"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             y="307.47116"
+             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4348">- Connection via cloud/internet:</tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
-             y="330.80444"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             y="330.80453"
+             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4350">- Back to Back: BTB</tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
-             y="354.13779"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             y="354.13791"
+             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4651">- Flow rules: </tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
-             y="377.47113"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             y="377.47128"
              id="tspan4340" /><tspan
              sodipodi:role="line"
              x="-0.59244788"
-             y="400.80444"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             y="400.80466"
              id="tspan4342" /></text>
       </g>
     </g>
     <g
        transform="translate(-414.95854,87.627341)"
        id="g1489-5"
-       style="stroke:#000000;stroke-opacity:1;fill:#ab9d92;fill-opacity:0.64313728">
+       style="fill:#ab9d92;fill-opacity:0.643137;stroke:#000000;stroke-opacity:1">
       <rect
          rx="6.4529891"
          y="118.30851"
@@ -742,18 +742,13 @@
          height="29.760508"
          width="51.623913"
          id="rect6039-1"
-         style="fill:#ab9d92;fill-opacity:0.64313728;stroke:#000000;stroke-width:0.41066644;stroke-opacity:1" />
+         style="fill:#ab9d92;fill-opacity:0.643137;stroke:#000000;stroke-width:0.410666;stroke-opacity:1" />
       <text
          id="text6054-9"
          y="127.71474"
          x="262.66827"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666667px;line-height:5px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ab9d92;fill-opacity:0.64313728;stroke:#000000;stroke-width:0.26458332;stroke-opacity:1"
-         xml:space="preserve"><tspan
-           id="tspan1479-0"
-           style="font-size:8.46666667px;line-height:5px;stroke-width:0.26458332;stroke:#000000;stroke-opacity:1;fill:#ab9d92;fill-opacity:0.64313728"
-           y="132.54945"
-           x="262.66827"
-           sodipodi:role="line" /></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:5px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ab9d92;fill-opacity:0.643137;stroke:#000000;stroke-width:0.264583;stroke-opacity:1"
+         xml:space="preserve" />
     </g>
   </g>
   <g
@@ -761,685 +756,647 @@
      id="layer2"
      inkscape:label="Trgt Schema"
      transform="translate(-1.4460939,-118.10318)">
-    <g
-       id="g2821">
-      <flowRoot
-         transform="matrix(0.26458333,0,0,0.26458333,0,87)"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:vertical-lr;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
-         id="flowRoot949"
-         xml:space="preserve"><flowRegion
-           id="flowRegion951"><rect
-             y="137.70079"
-             x="872"
-             height="25.079741"
-             width="201.71744"
-             id="rect953" /></flowRegion><flowPara
-           id="flowPara955" /></flowRoot>      <text
-         id="text947"
-         y="127.42318"
-         x="253.30237"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-         xml:space="preserve"><tspan
-           style="font-size:5.64444447px;writing-mode:lr-tb;stroke-width:0.26458332"
-           y="133.14297"
-           x="253.30237"
-           id="tspan945"
-           sodipodi:role="line" /></text>
-      <text
-         id="text4180-4"
+    <flowRoot
+       transform="matrix(0.26458333,0,0,0.26458333,0,87)"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:vertical-lr;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+       id="flowRoot949"
+       xml:space="preserve"><flowRegion
+         id="flowRegion951"><rect
+           y="137.70079"
+           x="872"
+           height="25.079741"
+           width="201.71744"
+           id="rect953" /></flowRegion><flowPara
+         id="flowPara955" /></flowRoot>
+    <text
+       id="text947"
+       y="127.42318"
+       x="253.30237"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       xml:space="preserve" />
+    <text
+       id="text4180-4"
+       y="140.75244"
+       x="-26.646427"
+       style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;filter:url(#filter4332-7)"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583"
          y="140.75244"
          x="-26.646427"
-         style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;filter:url(#filter4332-7)"
-         xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332"
-           y="140.75244"
-           x="-26.646427"
-           id="tspan4178-0"
-           sodipodi:role="line">uCPE Device</tspan></text>
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-64-9"
-         d="m 266.39304,242.05073 -5.00906,-38.32387"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.60000001, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-64-9-0"
-         d="m 268.53365,148.2789 -5.00906,38.32387"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.60000002, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path5091-2"
-         d="m 265.1663,184.81589 a 10.213003,8.6845435 0 0 0 -6.68017,2.12972 7.3267194,4.8471871 0 0 0 -1.53463,-0.11005 7.3267194,4.8471871 0 0 0 -6.28296,2.36481 10.172598,7.1157176 0 0 0 -1.00344,-0.0351 10.172598,7.1157176 0 0 0 -10.17267,7.11576 10.172598,7.1157176 0 0 0 2.74795,4.85586 5.1065016,3.4334242 0 0 0 -0.16434,0.84612 5.1065016,3.4334242 0 0 0 5.10649,3.43343 5.1065016,3.4334242 0 0 0 1.79049,-0.21972 4.662458,5.6550516 0 0 0 3.09399,1.43152 4.662458,5.6550516 0 0 0 2.64388,-1.00471 8.4368287,6.0589839 0 0 0 6.01497,1.81257 8.4368287,6.0589839 0 0 0 6.52493,-2.22359 12.433222,5.0491531 0 0 0 5.9083,0.60786 12.433222,5.0491531 0 0 0 12.43322,-5.04915 12.433222,5.0491531 0 0 0 -0.73936,-1.70053 9.6231236,5.6550516 0 0 0 3.11178,-4.15649 9.6231236,5.6550516 0 0 0 -9.62282,-5.65505 9.6231236,5.6550516 0 0 0 -3.96431,0.50965 10.213003,8.6845435 0 0 0 -9.2113,-4.9529 z"
-         style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.19981423;stroke-opacity:1;filter:url(#filter4332-6)" />
-      <text
-         id="text6011-4"
+         id="tspan4178-0"
+         sodipodi:role="line">uCPE Device</tspan></text>
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-64-9"
+       d="m 266.39304,242.05073 -5.00906,-38.32387"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.6, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-64-9-0"
+       d="m 268.53365,148.2789 -5.00906,38.32387"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.6, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path5091-2"
+       d="m 265.1663,184.81589 a 10.213003,8.6845435 0 0 0 -6.68017,2.12972 7.3267194,4.8471871 0 0 0 -1.53463,-0.11005 7.3267194,4.8471871 0 0 0 -6.28296,2.36481 10.172598,7.1157176 0 0 0 -1.00344,-0.0351 10.172598,7.1157176 0 0 0 -10.17267,7.11576 10.172598,7.1157176 0 0 0 2.74795,4.85586 5.1065016,3.4334242 0 0 0 -0.16434,0.84612 5.1065016,3.4334242 0 0 0 5.10649,3.43343 5.1065016,3.4334242 0 0 0 1.79049,-0.21972 4.662458,5.6550516 0 0 0 3.09399,1.43152 4.662458,5.6550516 0 0 0 2.64388,-1.00471 8.4368287,6.0589839 0 0 0 6.01497,1.81257 8.4368287,6.0589839 0 0 0 6.52493,-2.22359 12.433222,5.0491531 0 0 0 5.9083,0.60786 12.433222,5.0491531 0 0 0 12.43322,-5.04915 12.433222,5.0491531 0 0 0 -0.73936,-1.70053 9.6231236,5.6550516 0 0 0 3.11178,-4.15649 9.6231236,5.6550516 0 0 0 -9.62282,-5.65505 9.6231236,5.6550516 0 0 0 -3.96431,0.50965 10.213003,8.6845435 0 0 0 -9.2113,-4.9529 z"
+       style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.199814;stroke-opacity:1;filter:url(#filter4332-6)" />
+    <text
+       id="text6011-4"
+       y="198.60991"
+       x="263.42371"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;filter:url(#filter4332-6)"
+       xml:space="preserve"><tspan
+         style="font-size:7.05556px;stroke-width:0.264583"
          y="198.60991"
          x="263.42371"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05555534px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;filter:url(#filter4332-6)"
-         xml:space="preserve"><tspan
-           style="font-size:7.05555534px;stroke-width:0.26458332"
-           y="198.60991"
-           x="263.42371"
-           id="tspan6009-5"
-           sodipodi:role="line">Internet</tspan></text>
-      <g
-         id="g6108"
-         transform="translate(229.03004,198.99263)">
-        <g
-           transform="translate(0,-6.3500003)"
-           id="g1117">
-          <rect
-             rx="5.9960117"
-             y="49.31292"
-             x="8.4991493"
-             height="32.516785"
-             width="54.967422"
-             id="rect5992"
-             style="fill:#ff9955;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.30122805;stroke-opacity:1" />
-          <text
-             id="text5996"
-             y="62.470726"
-             x="35.614925"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-             xml:space="preserve"><tspan
-               style="stroke-width:0.26458332"
-               y="62.470726"
-               x="35.614925"
-               id="tspan5994"
-               sodipodi:role="line">uCPE</tspan><tspan
-               id="tspan5998"
-               style="stroke-width:0.26458332"
-               y="73.054062"
-               x="35.614925"
-               sodipodi:role="line">Manager</tspan></text>
-        </g>
-      </g>
+         id="tspan6009-5"
+         sodipodi:role="line">Internet</tspan></text>
+    <g
+       id="g376">
       <rect
-         rx="16.325657"
-         y="144.03362"
-         x="-26.00753"
-         height="101.71231"
-         width="255.02283"
-         id="rect2700"
-         style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.68559104;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.37118189, 0.68559094, 0.34279548, 0.68559094;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-64"
-         d="m 115.10448,236.3616 90.22324,-35.73878"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.6, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
-      <g
-         transform="translate(4.2333335,1.1204851e-6)"
-         id="g2676">
-        <rect
-           rx="2.0431714"
-           y="188.76456"
-           x="-200.64168"
-           height="24.429752"
-           width="8.1726856"
-           id="rect6098-9"
-           style="fill:#ffd32a;fill-opacity:0.64313725;stroke:#000000;stroke-width:0.11822366;stroke-opacity:1"
-           transform="rotate(-90)" />
-        <text
-           id="text892-8"
-           y="197.64984"
-           x="200.812"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
-           xml:space="preserve"><tspan
-             style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975"
-             y="197.64984"
-             x="200.812"
-             id="tspan890-8"
-             sodipodi:role="line">ibm_br</tspan></text>
-      </g>
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-2-4-3"
-         d="m 77.127442,176.91943 h 12.828"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         rx="5.9960117"
+         y="241.95555"
+         x="237.52919"
+         height="32.516785"
+         width="54.967422"
+         id="rect5992"
+         style="fill:#ff9955;fill-opacity:0.641414;stroke:#000000;stroke-width:0.301228;stroke-opacity:1" />
+      <text
+         id="text5996"
+         y="255.32437"
+         x="264.72488"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.76111px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         xml:space="preserve"><tspan
+           id="tspan5998"
+           style="font-size:7.76111px;stroke-width:0.264583"
+           y="255.32437"
+           x="264.72488"
+           sodipodi:role="line">Enea Edge </tspan><tspan
+           style="font-size:7.76111px;stroke-width:0.264583"
+           y="265.02576"
+           x="265.80304"
+           sodipodi:role="line"
+           id="tspan370">Management </tspan></text>
+    </g>
+    <rect
+       rx="16.325657"
+       y="144.03362"
+       x="-26.00753"
+       height="101.71231"
+       width="255.02283"
+       id="rect2700"
+       style="vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.685591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.37118, 0.685591, 0.342795, 0.685591;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-64"
+       d="m 115.10448,236.3616 90.22324,-35.73878"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.6, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
+    <g
+       transform="translate(4.2333335)"
+       id="g2676">
       <rect
-         transform="rotate(-90)"
-         style="fill:#ffd32a;fill-opacity:0.64313725;stroke:#000000;stroke-width:0.11822366;stroke-opacity:1"
-         id="rect6098-9-6-2"
-         width="8.1726856"
+         rx="2.0431714"
+         y="188.76456"
+         x="-200.64168"
          height="24.429752"
-         x="-181.00621"
-         y="89.828568"
-         rx="2.0431714" />
+         width="8.1726856"
+         id="rect6098-9"
+         style="fill:#ffd32a;fill-opacity:0.643137;stroke:#000000;stroke-width:0.118224;stroke-opacity:1"
+         transform="rotate(-90)" />
       <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+         id="text892-8"
+         y="197.64984"
+         x="200.812"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+         xml:space="preserve"><tspan
+           style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825"
+           y="197.64984"
+           x="200.812"
+           id="tspan890-8"
+           sodipodi:role="line">ibm_br</tspan></text>
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-2-4-3"
+       d="m 77.127442,176.91943 h 12.828"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       transform="rotate(-90)"
+       style="fill:#ffd32a;fill-opacity:0.643137;stroke:#000000;stroke-width:0.118224;stroke-opacity:1"
+       id="rect6098-9-6-2"
+       width="8.1726856"
+       height="24.429752"
+       x="-181.00621"
+       y="89.828568"
+       rx="2.0431714" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+       x="101.88118"
+       y="178.01437"
+       id="text892-8-9-5"><tspan
+         sodipodi:role="line"
+         id="tspan890-8-6-4"
          x="101.88118"
          y="178.01437"
-         id="text892-8-9-5"><tspan
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">lsfc_br</tspan></text>
+    <rect
+       rx="6"
+       y="154.01778"
+       x="125.00951"
+       height="57.062046"
+       width="54.62989"
+       id="rect5977"
+       style="fill:#72b500;fill-opacity:0.839216;stroke:#000000;stroke-width:0.264583;stroke-opacity:1" />
+    <g
+       transform="translate(-1.5662411,-4.5514539)"
+       id="g2216">
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         x="153.00713"
+         y="180.28951"
+         id="text5981" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         x="153.51656"
+         y="193.33939"
+         id="text5981-9"><tspan
            sodipodi:role="line"
-           id="tspan890-8-6-4"
-           x="101.88118"
-           y="178.01437"
-           style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">lsfc_br</tspan></text>
-      <rect
-         rx="6"
-         y="154.01778"
-         x="125.00951"
-         height="57.062046"
-         width="54.62989"
-         id="rect5977"
-         style="fill:#72b500;fill-opacity:0.8392157;stroke:#000000;stroke-width:0.26458332;stroke-opacity:1" />
-      <g
-         transform="translate(-1.5662411,-4.5514539)"
-         id="g2216">
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-           x="153.00713"
-           y="180.28951"
-           id="text5981"><tspan
-             sodipodi:role="line"
-             x="153.00713"
-             y="187.91589"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.26458332"
-             id="tspan5983" /></text>
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
            x="153.51656"
            y="193.33939"
-           id="text5981-9"><tspan
-             sodipodi:role="line"
-             x="153.51656"
-             y="193.33939"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.26458332"
-             id="tspan5983-0">128T</tspan></text>
-      </g>
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.264583"
+           id="tspan5983-0">128T</tspan></text>
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+       x="130.10648"
+       y="178.40254"
+       id="text892-8-9-5-5"><tspan
+         sodipodi:role="line"
+         id="tspan890-8-6-4-2"
          x="130.10648"
          y="178.40254"
-         id="text892-8-9-5-5"><tspan
-           sodipodi:role="line"
-           id="tspan890-8-6-4-2"
-           x="130.10648"
-           y="178.40254"
-           style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">LAN</tspan></text>
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">LAN</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+       x="173.88567"
+       y="197.8927"
+       id="text892-8-9-5-5-7"><tspan
+         sodipodi:role="line"
+         id="tspan890-8-6-4-2-5"
          x="173.88567"
          y="197.8927"
-         id="text892-8-9-5-5-7"><tspan
-           sodipodi:role="line"
-           id="tspan890-8-6-4-2-5"
-           x="173.88567"
-           y="197.8927"
-           style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">WAN</tspan></text>
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">WAN</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+       x="152.23137"
+       y="209.60852"
+       id="text892-8-9-5-5-7-6"><tspan
+         sodipodi:role="line"
+         id="tspan890-8-6-4-2-5-4"
          x="152.23137"
          y="209.60852"
-         id="text892-8-9-5-5-7-6"><tspan
-           sodipodi:role="line"
-           id="tspan890-8-6-4-2-5-4"
-           x="152.23137"
-           y="209.60852"
-           style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">MGMT</tspan></text>
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-2-4-3-1"
-         d="m 114.43454,176.90997 h 10.528"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-2-4-3-1-3"
-         d="m 179.82558,196.6529 h 13.128"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-6-0"
-         d="m 217.53236,196.67 h 21.928"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.60000001, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         y="192.75043"
-         x="227.74036"
-         height="7.845396"
-         width="2.5537291"
-         id="rect2227-5"
-         style="opacity:1;vector-effect:none;fill:#ffff01;fill-opacity:1;stroke:#000000;stroke-width:0.3275212;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <text
-         id="text2695-7"
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">MGMT</tspan></text>
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-2-4-3-1"
+       d="m 114.43454,176.90997 h 10.528"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-2-4-3-1-3"
+       d="m 179.82558,196.6529 h 13.128"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-6-0"
+       d="m 217.53236,196.67 h 21.928"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.6, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       y="192.75043"
+       x="227.74036"
+       height="7.845396"
+       width="2.5537291"
+       id="rect2227-5"
+       style="vector-effect:none;fill:#ffff01;fill-opacity:1;stroke:#000000;stroke-width:0.327521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <text
+       id="text2695-7"
+       y="214.73219"
+       x="150.09465"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       xml:space="preserve"><tspan
+         style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583"
          y="214.73219"
          x="150.09465"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-         xml:space="preserve"><tspan
-           style="font-size:3.52777767px;writing-mode:lr-tb;stroke-width:0.26458332"
-           y="214.73219"
-           x="150.09465"
-           id="tspan2693-9"
-           sodipodi:role="line">.2</tspan></text>
-      <text
-         id="text2695-5"
+         id="tspan2693-9"
+         sodipodi:role="line">.2</tspan></text>
+    <text
+       id="text2695-5"
+       y="175.89812"
+       x="123.06345"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       xml:space="preserve"><tspan
+         style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583"
          y="175.89812"
          x="123.06345"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-         xml:space="preserve"><tspan
-           style="font-size:3.52777767px;writing-mode:lr-tb;stroke-width:0.26458332"
-           y="175.89812"
-           x="123.06345"
-           id="tspan2693-95"
-           sodipodi:role="line">.1</tspan></text>
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-2-4-3-14"
-         d="m -25.47561,176.91943 h 12.828"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         y="172.71829"
-         x="-27.148451"
-         height="7.9598031"
-         width="2.5477617"
-         id="rect2227"
-         style="opacity:1;vector-effect:none;fill:#ffff01;fill-opacity:1;stroke:#000000;stroke-width:0.32951498;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         id="tspan2693-95"
+         sodipodi:role="line">.1</tspan></text>
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-2-4-3-14"
+       d="m -25.47561,176.91943 h 12.828"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       y="172.71829"
+       x="-27.148451"
+       height="7.9598031"
+       width="2.5477617"
+       id="rect2227"
+       style="vector-effect:none;fill:#ffff01;fill-opacity:1;stroke:#000000;stroke-width:0.329515;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <g
+       id="g1660">
       <g
-         id="g1660">
+         id="g2177"
+         transform="matrix(0.36573648,0,0,0.36628718,-55.69298,80.968281)">
         <g
-           id="g2177"
-           transform="matrix(0.36573648,0,0,0.36628718,-55.69298,80.968281)">
+           id="g2160">
+          <path
+             style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+             d="m 14.089065,261.95608 h 48.428"
+             id="path8471-3-2-4-2"
+             inkscape:connector-curvature="0" />
           <g
-             id="g2160">
-            <path
-               style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-               d="m 14.089065,261.95608 h 48.428"
-               id="path8471-3-2-4-2"
-               inkscape:connector-curvature="0" />
+             id="g2136"
+             transform="translate(-0.08009955)">
             <g
-               id="g2136"
-               transform="translate(-0.08009955)">
+               id="g2102">
               <g
-                 id="g2102">
-                <g
-                   id="g2086">
-                  <path
-                     inkscape:connector-curvature="0"
-                     id="path8471-3-2-4-2-9"
-                     d="m 50.199738,174.82006 v 4.928"
-                     style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-                     transform="translate(0,87)" />
-                  <rect
-                     y="266.31744"
-                     x="42.699738"
-                     height="15"
-                     width="15"
-                     id="rect1948-6"
-                     style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-                </g>
-              </g>
-              <g
-                 id="g2102-4"
-                 transform="translate(-23.633146)">
-                <g
-                   id="g2086-8">
-                  <path
-                     inkscape:connector-curvature="0"
-                     id="path8471-3-2-4-2-9-0"
-                     d="m 50.199738,174.82006 v 4.928"
-                     style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-                     transform="translate(0,87)" />
-                  <rect
-                     y="266.31744"
-                     x="42.699738"
-                     height="15"
-                     width="15"
-                     id="rect1948-6-3"
-                     style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-                </g>
+                 id="g2086">
+                <path
+                   inkscape:connector-curvature="0"
+                   id="path8471-3-2-4-2-9"
+                   d="m 50.199738,174.82006 v 4.928"
+                   style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+                   transform="translate(0,87)" />
+                <rect
+                   y="266.31744"
+                   x="42.699738"
+                   height="15"
+                   width="15"
+                   id="rect1948-6"
+                   style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
               </g>
             </g>
-          </g>
-          <g
-             id="g2102-9"
-             transform="rotate(180,44.251401,261.95726)">
             <g
-               id="g2086-4">
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path8471-3-2-4-2-9-7"
-                 d="m 50.199738,174.82006 v 4.928"
-                 style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-                 transform="translate(0,87)" />
-              <rect
-                 y="266.31744"
-                 x="42.699738"
-                 height="15"
-                 width="15"
-                 id="rect1948-6-4"
-                 style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+               id="g2102-4"
+               transform="translate(-23.633146)">
+              <g
+                 id="g2086-8">
+                <path
+                   inkscape:connector-curvature="0"
+                   id="path8471-3-2-4-2-9-0"
+                   d="m 50.199738,174.82006 v 4.928"
+                   style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+                   transform="translate(0,87)" />
+                <rect
+                   y="266.31744"
+                   x="42.699738"
+                   height="15"
+                   width="15"
+                   id="rect1948-6-3"
+                   style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+              </g>
             </g>
           </g>
         </g>
         <g
-           style="fill:#ac9d93;filter:url(#filter4332)"
-           id="g6108-0"
-           transform="matrix(0.81278123,0,0,0.7263691,-101.76052,132.55338)">
-          <rect
-             rx="6.0006089"
-             y="49.061516"
-             x="8.1325779"
-             height="24.0366"
-             width="55.009563"
-             id="rect5992-4"
-             style="fill:#ac9d93;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.25908634;stroke-opacity:1" />
-          <text
-             xml:space="preserve"
-             style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-             x="53.59409"
-             y="60.119961"
-             id="text15008-4"><tspan
-               sodipodi:role="line"
-               id="tspan15006-8"
-               x="53.59409"
-               y="69.483727"
-               style="fill:#ac9d93;stroke-width:0.26458332" /><tspan
-               sodipodi:role="line"
-               x="53.59409"
-               y="82.712898"
-               style="fill:#ac9d93;stroke-width:0.26458332"
-               id="tspan15010-2" /></text>
+           id="g2102-9"
+           transform="rotate(180,44.251401,261.95726)">
+          <g
+             id="g2086-4">
+            <path
+               inkscape:connector-curvature="0"
+               id="path8471-3-2-4-2-9-7"
+               d="m 50.199738,174.82006 v 4.928"
+               style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+               transform="translate(0,87)" />
+            <rect
+               y="266.31744"
+               x="42.699738"
+               height="15"
+               width="15"
+               id="rect1948-6-4"
+               style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+          </g>
         </g>
+      </g>
+      <g
+         style="fill:#ac9d93;filter:url(#filter4332)"
+         id="g6108-0"
+         transform="matrix(0.81278123,0,0,0.7263691,-101.76052,132.55338)">
+        <rect
+           rx="6.0006089"
+           y="49.061516"
+           x="8.1325779"
+           height="24.0366"
+           width="55.009563"
+           id="rect5992-4"
+           style="fill:#ac9d93;fill-opacity:0.641414;stroke:#000000;stroke-width:0.259086;stroke-opacity:1" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;filter:url(#filter4332)"
+           style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.264583"
+           x="53.59409"
+           y="60.119961"
+           id="text15008-4" />
+      </g>
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;filter:url(#filter4332)"
+         x="12.285738"
+         y="179.02138"
+         id="text4180"
+         transform="matrix(0.99862164,0,0,1.0001253,-103.17944,-0.02216172)"><tspan
+           sodipodi:role="line"
+           id="tspan4178"
            x="12.285738"
            y="179.02138"
-           id="text4180"
-           transform="matrix(0.99862164,0,0,1.0001253,-103.17944,-0.02216172)"><tspan
-             sodipodi:role="line"
-             id="tspan4178"
-             x="12.285738"
-             y="179.02138"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332">Test Machine</tspan></text>
-        <path
-           style="display:inline;fill:none;stroke:#000000;stroke-width:0.29981196;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.59962392, 0.29981196, 0.14990598, 0.29981196;stroke-dashoffset:0;stroke-opacity:1"
-           d="m -33.356642,176.91944 h 6.319277"
-           id="path8471-3-6-0-7"
-           inkscape:connector-curvature="0" />
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52556634px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26441747"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583">Test Machine</tspan></text>
+      <path
+         style="display:inline;fill:none;stroke:#000000;stroke-width:0.299812;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.599624, 0.299812, 0.149906, 0.299812;stroke-dashoffset:0;stroke-opacity:1"
+         d="m -33.356642,176.91944 h 6.319277"
+         id="path8471-3-6-0-7"
+         inkscape:connector-curvature="0" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52557px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264417"
+         x="-47.92791"
+         y="176.02995"
+         id="text2695-7-0"
+         transform="scale(0.99924797,1.0007526)"><tspan
+           sodipodi:role="line"
+           id="tspan2693-9-4"
            x="-47.92791"
            y="176.02995"
-           id="text2695-7-0"
-           transform="scale(0.99924797,1.0007526)"><tspan
-             sodipodi:role="line"
-             id="tspan2693-9-4"
-             x="-47.92791"
-             y="176.02995"
-             style="font-size:3.52556634px;writing-mode:lr-tb;stroke-width:0.26441747">.2</tspan></text>
-      </g>
-      <text
-         id="text2770"
+           style="font-size:3.52557px;writing-mode:lr-tb;stroke-width:0.264417">.2</tspan></text>
+    </g>
+    <text
+       id="text2770"
+       y="171.6506"
+       x="101.91634"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       xml:space="preserve"><tspan
+         style="writing-mode:lr-tb;stroke-width:0.264583"
          y="171.6506"
          x="101.91634"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-         xml:space="preserve"><tspan
-           style="writing-mode:lr-tb;stroke-width:0.26458332"
-           y="171.6506"
-           x="101.91634"
-           id="tspan2768"
-           sodipodi:role="line">192.168.64.0/24</tspan></text>
+         id="tspan2768"
+         sodipodi:role="line">192.168.64.0/24</tspan></text>
+    <g
+       transform="translate(12.876938,3.7041668)"
+       id="g1953">
       <g
-         transform="translate(12.876938,3.7041668)"
-         id="g1953">
-        <g
-           id="g2691"
-           transform="translate(-58.125198,-0.52916555)">
-          <rect
-             transform="rotate(-90)"
-             style="fill:#ffd32a;fill-opacity:0.64313725;stroke:#000000;stroke-width:0.1247495;stroke-opacity:1"
-             id="rect6098-9-6"
-             width="8.1726856"
-             height="27.201187"
-             x="-236.89076"
-             y="133.15155"
-             rx="2.0431714" />
-          <text
-             xml:space="preserve"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
-             x="146.69841"
-             y="233.89996"
-             id="text892-8-9"><tspan
-               sodipodi:role="line"
-               id="tspan890-8-6"
-               x="146.69841"
-               y="233.89996"
-               style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">vnf_mgmt_br</tspan></text>
-        </g>
+         id="g2691"
+         transform="translate(-58.125198,-0.52916555)">
+        <rect
+           transform="rotate(-90)"
+           style="fill:#ffd32a;fill-opacity:0.643137;stroke:#000000;stroke-width:0.124749;stroke-opacity:1"
+           id="rect6098-9-6"
+           width="8.1726856"
+           height="27.201187"
+           x="-236.89076"
+           y="133.15155"
+           rx="2.0431714" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+           x="146.69841"
+           y="233.89996"
+           id="text892-8-9"><tspan
+             sodipodi:role="line"
+             id="tspan890-8-6"
+             x="146.69841"
+             y="233.89996"
+             style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">vnf_mgmt_br</tspan></text>
+      </g>
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         x="88.791451"
+         y="227.15002"
+         id="text2695"><tspan
+           sodipodi:role="line"
+           id="tspan2693"
            x="88.791451"
            y="227.15002"
-           id="text2695"><tspan
-             sodipodi:role="line"
-             id="tspan2693"
-             x="88.791451"
-             y="227.15002"
-             style="font-size:3.52777767px;writing-mode:lr-tb;stroke-width:0.26458332">.1</tspan></text>
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;opacity:0.98999999;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+           style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583">.1</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;opacity:0.99;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         x="88.499825"
+         y="221.29282"
+         id="text2770-0"><tspan
+           sodipodi:role="line"
+           id="tspan2768-4"
            x="88.499825"
            y="221.29282"
-           id="text2770-0"><tspan
-             sodipodi:role="line"
-             id="tspan2768-4"
-             x="88.499825"
-             y="221.29282"
-             style="writing-mode:lr-tb;stroke-width:0.26458332">10.0.0.0/24</tspan></text>
-      </g>
-      <g
-         transform="translate(-98.455487)"
-         id="g2766-9">
-        <rect
-           rx="2.0431714"
-           y="85.681"
-           x="-181.00621"
-           height="24.429752"
-           width="8.1726856"
-           id="rect6098-9-6-2-9"
-           style="fill:#ffd32a;fill-opacity:0.64313725;stroke:#000000;stroke-width:0.11822366;stroke-opacity:1"
-           transform="rotate(-90)" />
-        <text
-           id="text892-8-9-5-6"
+           style="writing-mode:lr-tb;stroke-width:0.264583">10.0.0.0/24</tspan></text>
+    </g>
+    <g
+       transform="translate(-98.455487)"
+       id="g2766-9">
+      <rect
+         rx="2.0431714"
+         y="85.681"
+         x="-181.00621"
+         height="24.429752"
+         width="8.1726856"
+         id="rect6098-9-6-2-9"
+         style="fill:#ffd32a;fill-opacity:0.643137;stroke:#000000;stroke-width:0.118224;stroke-opacity:1"
+         transform="rotate(-90)" />
+      <text
+         id="text892-8-9-5-6"
+         y="178.01437"
+         x="97.733612"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+         xml:space="preserve"><tspan
+           style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825"
            y="178.01437"
            x="97.733612"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
-           xml:space="preserve"><tspan
-             style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975"
-             y="178.01437"
-             x="97.733612"
-             id="tspan890-8-6-4-1"
-             sodipodi:role="line">lan_br</tspan></text>
-      </g>
-      <rect
-         rx="6"
-         y="154.01778"
-         x="22.406458"
-         height="57.062046"
-         width="54.62989"
-         id="rect5977-0"
-         style="fill:#89c129;fill-opacity:1;stroke:#000000;stroke-width:0.26458332;stroke-opacity:1" />
-      <g
-         transform="translate(-102.85171,17.778478)"
-         id="g2216-0">
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+           id="tspan890-8-6-4-1"
+           sodipodi:role="line">lan_br</tspan></text>
+    </g>
+    <rect
+       rx="6"
+       y="154.01778"
+       x="22.406458"
+       height="57.062046"
+       width="54.62989"
+       id="rect5977-0"
+       style="fill:#89c129;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-opacity:1" />
+    <g
+       transform="translate(-102.85171,17.778478)"
+       id="g2216-0">
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         x="152.40361"
+         y="171.23683"
+         id="text5981-2"><tspan
+           sodipodi:role="line"
            x="152.40361"
            y="171.23683"
-           id="text5981-2"><tspan
-             sodipodi:role="line"
-             x="152.40361"
-             y="171.23683"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.26458332"
-             id="tspan5983-8">Fortigate</tspan></text>
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-           x="153.08981"
-           y="198.8871"
-           id="text5981-9-6"><tspan
-             sodipodi:role="line"
-             x="153.08981"
-             y="206.51349"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.26458332"
-             id="tspan5983-0-9" /></text>
-      </g>
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.264583"
+           id="tspan5983-8">Fortigate</tspan></text>
       <text
          xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         x="153.08981"
+         y="198.8871"
+         id="text5981-9-6" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+       x="27.503428"
+       y="178.40254"
+       id="text892-8-9-5-5-8"><tspan
+         sodipodi:role="line"
+         id="tspan890-8-6-4-2-3"
          x="27.503428"
          y="178.40254"
-         id="text892-8-9-5-5-8"><tspan
-           sodipodi:role="line"
-           id="tspan890-8-6-4-2-3"
-           x="27.503428"
-           y="178.40254"
-           style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">LAN</tspan></text>
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">LAN</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+       x="71.282616"
+       y="178.3138"
+       id="text892-8-9-5-5-7-2"><tspan
+         sodipodi:role="line"
+         id="tspan890-8-6-4-2-5-6"
          x="71.282616"
          y="178.3138"
-         id="text892-8-9-5-5-7-2"><tspan
-           sodipodi:role="line"
-           id="tspan890-8-6-4-2-5-6"
-           x="71.282616"
-           y="178.3138"
-           style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">WAN</tspan></text>
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">WAN</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+       x="49.628311"
+       y="209.60852"
+       id="text892-8-9-5-5-7-6-9"><tspan
+         sodipodi:role="line"
+         id="tspan890-8-6-4-2-5-4-4"
          x="49.628311"
          y="209.60852"
-         id="text892-8-9-5-5-7-6-9"><tspan
-           sodipodi:role="line"
-           id="tspan890-8-6-4-2-5-4-4"
-           x="49.628311"
-           y="209.60852"
-           style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">MGMT</tspan></text>
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-2-4-3-1-38"
-         d="M 11.831489,176.90997 H 22.359488"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <text
-         id="text2695-7-8"
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">MGMT</tspan></text>
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-2-4-3-1-38"
+       d="M 11.831489,176.90997 H 22.359488"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <text
+       id="text2695-7-8"
+       y="214.73219"
+       x="47.4916"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       xml:space="preserve"><tspan
+         style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583"
          y="214.73219"
          x="47.4916"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-         xml:space="preserve"><tspan
-           style="font-size:3.52777767px;writing-mode:lr-tb;stroke-width:0.26458332"
-           y="214.73219"
-           x="47.4916"
-           id="tspan2693-9-0"
-           sodipodi:role="line">.3</tspan></text>
-      <text
-         id="text2695-5-2"
+         id="tspan2693-9-0"
+         sodipodi:role="line">.3</tspan></text>
+    <text
+       id="text2695-5-2"
+       y="175.89812"
+       x="20.460402"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       xml:space="preserve"><tspan
+         style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583"
          y="175.89812"
          x="20.460402"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-         xml:space="preserve"><tspan
-           style="font-size:3.52777767px;writing-mode:lr-tb;stroke-width:0.26458332"
-           y="175.89812"
-           x="20.460402"
-           id="tspan2693-95-4"
-           sodipodi:role="line">.1</tspan></text>
-      <text
-         id="text2770-9"
+         id="tspan2693-95-4"
+         sodipodi:role="line">.1</tspan></text>
+    <text
+       id="text2770-9"
+       y="171.6506"
+       x="-0.68670934"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       xml:space="preserve"><tspan
+         style="writing-mode:lr-tb;stroke-width:0.264583"
          y="171.6506"
-         x="-0.68670934"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-         xml:space="preserve"><tspan
-           style="writing-mode:lr-tb;stroke-width:0.26458332"
-           y="171.6506"
-           x="-0.68670976"
-           id="tspan2768-8"
-           sodipodi:role="line">172.16.1.0/24</tspan></text>
-      <text
-         transform="scale(0.99924797,1.0007526)"
-         id="text2695-7-0-8"
+         x="-0.6867094"
+         id="tspan2768-8"
+         sodipodi:role="line">172.16.1.0/24</tspan></text>
+    <text
+       transform="scale(0.99924797,1.0007526)"
+       id="text2695-7-0-8"
+       y="176.02995"
+       x="79.167603"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52557px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264417"
+       xml:space="preserve"><tspan
+         style="font-size:3.52557px;writing-mode:lr-tb;stroke-width:0.264417"
          y="176.02995"
          x="79.167603"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52556634px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26441747"
-         xml:space="preserve"><tspan
-           style="font-size:3.52556634px;writing-mode:lr-tb;stroke-width:0.26441747"
-           y="176.02995"
-           x="79.167603"
-           id="tspan2693-9-4-7"
-           sodipodi:role="line">.2</tspan></text>
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-64-5"
-         d="M 87.805429,236.23645 49.787296,211.32258"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.6, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-64-53"
-         d="M 115.00864,236.45949 149.76744,211.266"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.6, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
+         id="tspan2693-9-4-7"
+         sodipodi:role="line">.2</tspan></text>
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-64-5"
+       d="M 87.805429,236.23645 49.787296,211.32258"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.6, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-64-53"
+       d="M 115.00864,236.45949 149.76744,211.266"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.6, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
+    <g
+       id="g2693">
       <g
-         id="g2693">
-        <g
-           id="g1489"
-           style="fill:#ab9d92;fill-opacity:0.64313725"
-           transform="matrix(1.2261286,0,0,1.052617,-59.360811,-7.5277952)">
-          <rect
-             rx="6.4529891"
-             y="118.30851"
-             x="236.69716"
-             height="29.760508"
-             width="51.623913"
-             id="rect6039"
-             style="fill:#ab9d92;fill-opacity:0.64313725;stroke:#000000;stroke-width:0.41066644;stroke-opacity:1" />
-          <text
-             id="text6054"
-             y="127.71474"
-             x="262.66827"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:5px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ab9d92;fill-opacity:0.64313725;stroke:none;stroke-width:0.26458332"
-             xml:space="preserve"><tspan
-               id="tspan1479"
-               style="font-size:4.23333311px;line-height:5px;fill:#ab9d92;fill-opacity:0.64313725;stroke-width:0.26458332"
-               y="132.54945"
-               x="262.66827"
-               sodipodi:role="line" /></text>
-        </g>
+         id="g1489"
+         style="fill:#ab9d92;fill-opacity:0.643137"
+         transform="matrix(1.2261286,0,0,1.052617,-59.360811,-7.5277952)">
+        <rect
+           rx="6.4529891"
+           y="118.30851"
+           x="236.69716"
+           height="29.760508"
+           width="51.623913"
+           id="rect6039"
+           style="fill:#ab9d92;fill-opacity:0.643137;stroke:#000000;stroke-width:0.410666;stroke-opacity:1" />
         <text
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+           id="text6054"
+           y="127.71474"
+           x="262.66827"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:5px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ab9d92;fill-opacity:0.643137;stroke:none;stroke-width:0.264583"
+           xml:space="preserve" />
+      </g>
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         x="262.49362"
+         y="126.3615"
+         id="text1719"><tspan
+           sodipodi:role="line"
            x="262.49362"
            y="126.3615"
-           id="text1719"><tspan
-             sodipodi:role="line"
-             x="262.49362"
-             y="126.3615"
-             style="font-size:7.05555534px;writing-mode:lr-tb;stroke-width:0.26458332"
-             id="tspan1727">Web Interface</tspan><tspan
-             sodipodi:role="line"
-             x="262.49362"
-             y="132.63882"
-             style="writing-mode:lr-tb;stroke-width:0.26458332"
-             id="tspan1721" /><tspan
-             sodipodi:role="line"
-             x="262.49362"
-             y="137.9305"
-             style="writing-mode:lr-tb;stroke-width:0.26458332"
-             id="tspan1723">(128T) https://&lt;IP&gt;:60001</tspan><tspan
-             sodipodi:role="line"
-             x="262.49362"
-             y="143.22215"
-             style="writing-mode:lr-tb;stroke-width:0.26458332"
-             id="tspan1725">(Fortigate) https://&lt;IP&gt;:60002</tspan></text>
-      </g>
+           style="font-size:7.05556px;writing-mode:lr-tb;stroke-width:0.264583"
+           id="tspan1727">Web Interface</tspan><tspan
+           sodipodi:role="line"
+           x="262.49362"
+           y="132.63882"
+           id="tspan1721" /><tspan
+           sodipodi:role="line"
+           x="262.49362"
+           y="137.93048"
+           style="writing-mode:lr-tb;stroke-width:0.264583"
+           id="tspan1723">(128T) https://&lt;IP&gt;:60001</tspan><tspan
+           sodipodi:role="line"
+           x="262.49362"
+           y="143.22214"
+           style="writing-mode:lr-tb;stroke-width:0.264583"
+           id="tspan1725">(Fortigate) https://&lt;IP&gt;:60002</tspan></text>
     </g>
   </g>
 </svg>
diff --git a/doc/book-enea-edge-example-usecases/doc/images/uc_clavister_bridge.png b/doc/book-enea-edge-example-usecases/doc/images/uc_clavister_bridge.png
new file mode 100644
index 0000000..97492ca
--- /dev/null
+++ b/doc/book-enea-edge-example-usecases/doc/images/uc_clavister_bridge.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_bridge.svg b/doc/book-enea-edge-example-usecases/doc/images/uc_clavister_bridge.svg
index 6aafc23..2890881 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_bridge.svg
+++ b/doc/book-enea-edge-example-usecases/doc/images/uc_clavister_bridge.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -15,9 +13,9 @@
    width="1118.8589"
    height="430.20746"
    viewBox="0 0 1118.8589 430.20746"
-   sodipodi:docname="uc_clavister_bridge_new.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   inkscape:export-filename="E:\Documents\ENEA Work files\ENFV work\ENA 2.2.2\Example Usecase pics\uc_clavister_bridge_new.png"
+   sodipodi:docname="uc_clavister_bridge.svg"
+   inkscape:version="1.0.2 (e86c870, 2021-01-15)"
+   inkscape:export-filename="D:\ENEA Work files\ENFV work\ENA 2.4\AP-636\uc_clavister_bridge.png"
    inkscape:export-xdpi="51.48"
    inkscape:export-ydpi="51.48">
   <metadata
@@ -28,7 +26,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -414,17 +412,17 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="713"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
      id="namedview4"
      showgrid="false"
-     inkscape:zoom="0.62"
-     inkscape:cx="570.58298"
-     inkscape:cy="298.20108"
+     inkscape:zoom="2.48"
+     inkscape:cx="584.97142"
+     inkscape:cy="325.32512"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:current-layer="layer3"
+     inkscape:current-layer="layer5"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
@@ -432,7 +430,8 @@
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:showpageshadow="false"
-     showborder="false" />
+     showborder="false"
+     inkscape:document-rotation="0" />
   <g
      inkscape:groupmode="layer"
      id="layer13"
@@ -459,44 +458,41 @@
          id="text4338-8"
          y="284.13779"
          x="-0.59244788"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;filter:url(#filter4332-4)"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;filter:url(#filter4332-4)"
          xml:space="preserve"><tspan
            id="tspan4344-6"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="284.13779"
            x="-0.59244788"
            sodipodi:role="line">Legend: </tspan><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.79837799px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.7984px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="320.57343"
            x="-0.59244788"
            sodipodi:role="line"
            id="tspan1311"><tspan
-   id="tspan1469"
-   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994">- Connection via cloud/internet:</tspan></tspan><tspan
+             id="tspan1469"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1">- Connection via cloud/internet:</tspan></tspan><tspan
            id="tspan1497"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.79837799px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.7984px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="359.39594"
            x="-0.59244788"
            sodipodi:role="line">-<tspan
    id="tspan1499"
-   style="font-size:29.14851379px"> VPN/Back to Back (BTB):</tspan></tspan><tspan
+   style="font-size:29.1485px"> VPN/Back to Back (BTB):</tspan></tspan><tspan
            id="tspan1514"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.79837799px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.7984px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="399.14392"
            x="-0.59244788"
            sodipodi:role="line">- Flow rules:</tspan><tspan
            id="tspan4651-8"
-           style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
            y="427.06345"
            x="-0.59244788"
            sodipodi:role="line" /><tspan
            id="tspan4340-3"
-           style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
            y="450.39679"
            x="-0.59244788"
            sodipodi:role="line" /><tspan
            id="tspan4342-1"
-           style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
            y="473.7301"
            x="-0.59244788"
            sodipodi:role="line" /></text>
@@ -518,10 +514,7 @@
        y="389.75635"
        x="987.85223"
        id="image1509"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB8AAAACCAYAAACg5gd8AAAABHNCSVQICAgIfAhkiAAAAC5JREFU
-CJlj/CIo+P//jx8MDN+/M9AT8DQ0CLOwhIUVE6Wamfk/k4jIFyra/wkAZPAMTyDetBwAAAAASUVO
-RK5CYII=
-"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB8AAAACCAYAAACg5gd8AAAABHNCSVQICAgIfAhkiAAAAC5JREFU CJlj/CIo+P//jx8MDN+/M9AT8DQ0CLOwhIUVE6Wamfk/k4jIFyra/wkAZPAMTyDetBwAAAAASUVO RK5CYII= "
        preserveAspectRatio="none"
        height="2"
        width="30.799999" />
@@ -534,29 +527,32 @@ RK5CYII=
      style="display:inline"
      sodipodi:insensitive="true">
     <path
-       style="fill:#ff1515;fill-opacity:1;stroke:#d26868;stroke-width:1.23500001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#ff1515;fill-opacity:1;stroke:#d26868;stroke-width:1.235;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 444.5424,89.232813 h 76.42476"
        id="path11527"
        inkscape:connector-curvature="0" />
-    <rect
-       style="fill:#ff9955;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.84495008;stroke-opacity:1"
-       id="rect5992-5"
-       width="221.36246"
-       height="63.53022"
-       x="375.70361"
-       y="353.04373"
-       rx="24.146883" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.99999809px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
-       x="485.46494"
-       y="391.01978"
-       id="text5996-5"><tspan
-         sodipodi:role="line"
-         x="485.46494"
-         y="391.01978"
-         style="font-size:24px;stroke-width:0.99999994"
-         id="tspan5998-2">uCPE Manager</tspan></text>
+    <g
+       id="g156">
+      <rect
+         style="fill:#ff9955;fill-opacity:0.641414;stroke:#000000;stroke-width:0.969371;stroke-opacity:1"
+         id="rect5992-5"
+         width="291.35449"
+         height="63.53022"
+         x="340.70761"
+         y="353.04373"
+         rx="31.781824" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
+         x="485.43564"
+         y="390.87329"
+         id="text5996-5"><tspan
+           sodipodi:role="line"
+           x="488.76962"
+           y="390.87329"
+           style="font-size:24px;stroke-width:1"
+           id="tspan5998-2">Enea Edge Management </tspan></text>
+    </g>
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 1.5, 0.75, 1.5;stroke-dashoffset:0;stroke-opacity:1"
        d="M 460.37542,254.79742 V 149.42008"
@@ -586,13 +582,13 @@ RK5CYII=
        id="path11692"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.75520343;stroke-opacity:1"
+       style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.755203;stroke-opacity:1"
        d="m 491.81875,246.74813 a 38.600327,32.823472 0 0 0 -25.24788,8.04933 27.691538,18.320077 0 0 0 -5.80018,-0.41593 27.691538,18.320077 0 0 0 -23.74662,8.93786 38.447615,26.894051 0 0 0 -3.79253,-0.13266 38.447615,26.894051 0 0 0 -38.4479,26.89421 38.447615,26.894051 0 0 0 10.38596,18.35286 19.300164,12.976722 0 0 0 -0.62115,3.19793 19.300164,12.976722 0 0 0 19.30015,12.97675 19.300164,12.976722 0 0 0 6.7672,-0.83044 17.621889,21.373424 0 0 0 11.69382,5.41047 17.621889,21.373424 0 0 0 9.99262,-3.79733 31.887227,22.900097 0 0 0 22.73375,6.85066 31.887227,22.900097 0 0 0 24.66115,-8.40412 46.991706,19.083413 0 0 0 22.33058,2.29742 46.991706,19.083413 0 0 0 46.9917,-19.0834 46.991706,19.083413 0 0 0 -2.79443,-6.4272 36.370861,21.373424 0 0 0 11.76106,-15.70957 36.370861,21.373424 0 0 0 -36.36972,-21.37342 36.370861,21.373424 0 0 0 -14.98321,1.92624 38.600327,32.823472 0 0 0 -34.81437,-18.71962 z"
        id="path5091-2"
        inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="485.34775"
        y="297.94391"
        id="text6011-4"><tspan
@@ -600,7 +596,7 @@ RK5CYII=
          id="tspan6009-5"
          x="485.34775"
          y="297.94391"
-         style="font-size:24px;stroke-width:0.99999994">Internet</tspan></text>
+         style="font-size:24px;stroke-width:1">Internet</tspan></text>
   </g>
   <g
      inkscape:groupmode="layer"
@@ -614,11 +610,7 @@ RK5CYII=
        style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
        x="1111.8201"
        y="185.74878"
-       id="text16006"><tspan
-         sodipodi:role="line"
-         id="tspan16004"
-         x="1111.8201"
-         y="221.1394" /></text>
+       id="text16006" />
     <rect
        style="display:inline;fill:#ffffff;fill-opacity:0.64141415;stroke:#000000;stroke-width:1.45701396;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect5977-6-3"
@@ -661,14 +653,14 @@ RK5CYII=
     </g>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="957.31738"
        y="-92.298775"
        id="text5981-3-7"><tspan
          sodipodi:role="line"
          x="957.31738"
          y="-92.298775"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:1"
          id="tspan5983-4-5">uCPE Device 2</tspan></text>
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:1.90288782;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -685,7 +677,7 @@ RK5CYII=
        rx="18.8976" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.3333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="1096.642"
        y="-37.128029"
        id="text6066-5"><tspan
@@ -693,11 +685,10 @@ RK5CYII=
          id="tspan6064-5"
          x="1096.642"
          y="-37.128029"
-         style="font-size:18.66666603px;stroke-width:0.99999994">Iperf client</tspan><tspan
+         style="font-size:18.6667px;stroke-width:1">Iperf client</tspan><tspan
          sodipodi:role="line"
          x="1096.642"
          y="-14.995701"
-         style="font-size:16px;stroke-width:0.99999994"
          id="tspan5627" /></text>
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:1.89580917;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -714,14 +705,14 @@ RK5CYII=
        rx="18.8976" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.3333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="1096.7786"
        y="59.194824"
        id="text6066-5-5"><tspan
          sodipodi:role="line"
          x="1096.7786"
          y="59.194824"
-         style="font-size:18.66666603px;stroke-width:0.99999994"
+         style="font-size:18.6667px;stroke-width:1"
          id="tspan5627-2">Iperf server</tspan></text>
     <path
        style="display:inline;fill:#777777;fill-opacity:1;stroke:#777777;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker7435-0)"
@@ -745,25 +736,25 @@ RK5CYII=
        inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.3333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="1096.9641"
        y="-2.1860938"
        id="text6066-5-66"><tspan
          sodipodi:role="line"
          x="1096.9641"
          y="-2.1860938"
-         style="font-size:16px;stroke-width:0.99999994"
+         style="font-size:16px;stroke-width:1"
          id="tspan5627-5">192.168.20.20</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.3333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="1097.2831"
        y="95.599319"
        id="text6066-5-5-5"><tspan
          sodipodi:role="line"
          x="1097.2831"
          y="95.599319"
-         style="font-size:16px;stroke-width:0.99999994"
+         style="font-size:16px;stroke-width:1"
          id="tspan5627-2-7">192.168.10.10</tspan></text>
     <g
        style="display:inline"
@@ -784,7 +775,7 @@ RK5CYII=
            transform="scale(-1)" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="-121.59303"
            y="293.63873"
            id="text892-7-6-7"
@@ -793,7 +784,7 @@ RK5CYII=
              id="tspan890-2-5-4"
              x="-121.59303"
              y="293.63873"
-             style="font-size:18.66666603px;writing-mode:lr-tb;stroke-width:0.99999994">bridge</tspan></text>
+             style="font-size:18.6667px;writing-mode:lr-tb;stroke-width:1">bridge</tspan></text>
       </g>
       <text
          id="text252"
@@ -801,7 +792,7 @@ RK5CYII=
          x="667.90558"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="186.91054"
            x="667.90558"
            id="tspan250"
@@ -854,14 +845,14 @@ RK5CYII=
     </g>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="169.95915"
        y="5.452795"
        id="text5981-3-7-7"><tspan
          sodipodi:role="line"
          x="169.95915"
          y="5.452795"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:1"
          id="tspan5983-4-5-6">uCPE Device 1</tspan></text>
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:1.90288782;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -903,14 +894,14 @@ RK5CYII=
        rx="22.734337" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.3333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="-29.048643"
        y="123.04565"
        id="text6066-5-6"><tspan
          sodipodi:role="line"
          x="-26.644997"
          y="123.04565"
-         style="font-size:17.33333397px;stroke-width:0.99999994"
+         style="font-size:17.3333px;stroke-width:1"
          id="tspan8402">Clavister </tspan></text>
     <text
        xml:space="preserve"
@@ -948,7 +939,7 @@ RK5CYII=
            transform="scale(-1)" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="-121.59303"
            y="293.63873"
            id="text892-7-6"
@@ -957,7 +948,7 @@ RK5CYII=
              id="tspan890-2-5"
              x="-121.59303"
              y="293.63873"
-             style="font-size:18.66666603px;writing-mode:lr-tb;stroke-width:0.99999994">bridge</tspan></text>
+             style="font-size:18.6667px;writing-mode:lr-tb;stroke-width:1">bridge</tspan></text>
       </g>
       <text
          id="text252-9"
@@ -965,7 +956,7 @@ RK5CYII=
          x="273.58078"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="188.12259"
            x="273.58078"
            id="tspan250-1"
diff --git a/doc/book-enea-edge-example-usecases/doc/images/uc_clavister_sriov.png b/doc/book-enea-edge-example-usecases/doc/images/uc_clavister_sriov.png
new file mode 100644
index 0000000..2c9ae6b
--- /dev/null
+++ b/doc/book-enea-edge-example-usecases/doc/images/uc_clavister_sriov.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_sriov.svg b/doc/book-enea-edge-example-usecases/doc/images/uc_clavister_sriov.svg
index 40cbd93..a33c619 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_sriov.svg
+++ b/doc/book-enea-edge-example-usecases/doc/images/uc_clavister_sriov.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -15,10 +13,10 @@
    viewBox="0 0 238.40312 130.74671"
    version="1.1"
    id="svg8"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="uc_clavister_sriov_new.svg"
+   inkscape:version="1.0.2 (e86c870, 2021-01-15)"
+   sodipodi:docname="uc_clavister_sriov.svg"
    style="enable-background:new"
-   inkscape:export-filename="E:\Documents\ENEA Work files\ENFV work\ENA 2.2.2\Example Usecase pics\uc_clavister_sriov_new.png"
+   inkscape:export-filename="E:\PortableApps\WinSCPPortable\App\winscp\scp54837\nfs\hosts\sestonas06\homes\mrpa\docu_work\NFV-Access\branches\feature_USERDOCAP-636\nfv-access-documentation\doc\book-enea-nfv-access-example-usecases\doc\images\uc_clavister_sriov.png"
    inkscape:export-xdpi="63.925339"
    inkscape:export-ydpi="63.925339">
   <defs
@@ -531,15 +529,15 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.81225243"
-     inkscape:cx="514.32224"
-     inkscape:cy="255.43341"
+     inkscape:zoom="1.1486984"
+     inkscape:cx="488.71255"
+     inkscape:cy="196.7697"
      inkscape:document-units="mm"
-     inkscape:current-layer="layer10"
+     inkscape:current-layer="layer12"
      showgrid="false"
      inkscape:showpageshadow="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="713"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
@@ -551,7 +549,8 @@
      showborder="false"
      width="300mm"
      showguides="true"
-     inkscape:guide-bbox="true">
+     inkscape:guide-bbox="true"
+     inkscape:document-rotation="0">
     <sodipodi:guide
        position="234.31314,62.223912"
        orientation="1,0"
@@ -586,7 +585,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -607,7 +606,8 @@
            height="71.385147"
            x="73.126244"
            y="-106.76833" /></flowRegion><flowPara
-         id="flowPara1101" /></flowRoot>    <flowRoot
+         id="flowPara1101" /></flowRoot>
+    <flowRoot
        transform="translate(45.709914,33.087017)"
        xml:space="preserve"
        id="flowRoot1107"
@@ -618,17 +618,13 @@
            height="156.6991"
            x="128.84148"
            y="-61.499702" /></flowRegion><flowPara
-         id="flowPara1113" /></flowRoot>    <text
+         id="flowPara1113" /></flowRoot>
+    <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="63.141701"
        y="70.058487"
-       id="text6115"><tspan
-         sodipodi:role="line"
-         id="tspan6113"
-         x="63.141701"
-         y="79.422256"
-         style="stroke-width:0.26458332" /></text>
+       id="text6115" />
     <g
        id="g2241"
        transform="translate(-15.799047,-41.898826)">
@@ -648,7 +644,7 @@
          style="display:inline">
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;filter:url(#filter4332-4-5)"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;filter:url(#filter4332-4-5)"
            x="-0.59244788"
            y="284.13779"
            id="text4338-8"
@@ -656,41 +652,38 @@
              sodipodi:role="line"
              x="-0.59244788"
              y="284.13779"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4344-6">Legend: </tspan><tspan
              id="tspan1311"
              sodipodi:role="line"
              x="-0.59244788"
              y="320.57343"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.79837799px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"><tspan
-               style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.7984px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"><tspan
+               style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
                id="tspan1469">- Connection via cloud/internet:</tspan></tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="359.39594"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.79837799px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.7984px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan1497">-<tspan
-   style="font-size:29.14851379px"
+   style="font-size:29.1485px"
    id="tspan1499"> VPN/Back to Back (BTB):</tspan></tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="399.14392"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.79837799px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.7984px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan1514">- Flow rules:</tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="427.06345"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4651-8" /><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="450.39679"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4340-3" /><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="473.7301"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4342-1" /></text>
       </g>
       <g
@@ -734,18 +727,18 @@
          id="text1462"
          y="98.868729"
          x="111.07041"
-         style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583"
            y="98.868729"
            x="111.07041"
            id="tspan1460"
            sodipodi:role="line">Internet</tspan></text>
     </g>
     <g
-       id="g1346">
+       id="g216">
       <g
-         transform="translate(87.515383,68.184073)"
+         transform="matrix(0.80350883,0,0,1,91.871977,68.184073)"
          id="g6108">
         <g
            id="g2625">
@@ -756,42 +749,32 @@
              height="24.0366"
              width="55.009563"
              id="rect5992"
-             style="fill:#ff9955;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.25908634;stroke-opacity:1" />
+             style="fill:#ff9955;fill-opacity:0.641414;stroke:#000000;stroke-width:0.259086;stroke-opacity:1" />
         </g>
         <text
            id="text15008"
            y="60.119961"
            x="53.59409"
-           style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-           xml:space="preserve"><tspan
-             style="stroke-width:0.26458332"
-             y="69.483727"
-             x="53.59409"
-             id="tspan15006"
-             sodipodi:role="line" /><tspan
-             id="tspan15010"
-             style="stroke-width:0.26458332"
-             y="82.712898"
-             x="53.59409"
-             sodipodi:role="line" /></text>
+           style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+           xml:space="preserve" />
       </g>
       <text
          transform="scale(0.94922996,1.0534855)"
          id="text6054-2-0-3"
-         y="120.37572"
-         x="129.69933"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.43264198px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.16977006"
+         y="120.33696"
+         x="126.71664"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.43264px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.16977"
          xml:space="preserve"><tspan
-           id="tspan1118-7-2-0"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.16977006"
-           y="120.37572"
-           x="129.69933"
-           sodipodi:role="line">uCPE</tspan><tspan
            id="tspan6174-7"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.16977006"
-           y="128.3132"
-           x="129.69933"
-           sodipodi:role="line"> Manager</tspan></text>
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.16977"
+           y="120.33696"
+           x="126.71664"
+           sodipodi:role="line">Enea Edge </tspan><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.16977"
+           y="128.27446"
+           x="127.59875"
+           sodipodi:role="line"
+           id="tspan207">Management </tspan></text>
     </g>
     <path
        transform="translate(0,-77.881364)"
@@ -858,7 +841,7 @@
        rx="10.417009" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;enable-background:new"
+       style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;enable-background:new"
        x="171.21869"
        y="16.540989"
        id="text1105-2"><tspan
@@ -866,7 +849,7 @@
          id="tspan1103-4"
          x="171.21869"
          y="16.540989"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888903px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332">uCPE Device2</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583">uCPE Device2</tspan></text>
     <g
        id="g2338"
        transform="translate(0,-1.5875)">
@@ -917,25 +900,25 @@
        rx="4.99999" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.58611107px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.58611px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="206.77724"
        y="58.461411"
        id="text6066-5-5"><tspan
          sodipodi:role="line"
          x="206.77724"
          y="58.461411"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888903px;font-family:Arial;-inkscape-font-specification:Arial;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:Arial;-inkscape-font-specification:Arial;stroke-width:0.264583"
          id="tspan5627-2">Iperf server</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.58611107px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.58611px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="206.91074"
        y="68.09343"
        id="text6066-5-5-5"><tspan
          sodipodi:role="line"
          x="206.91074"
          y="68.09343"
-         style="font-size:4.23333311px;stroke-width:0.26458332"
+         style="font-size:4.23333px;stroke-width:0.264583"
          id="tspan5627-2-7">192.168.10.10</tspan></text>
     <g
        id="g1222"
@@ -973,7 +956,7 @@
        transform="scale(-1,1)" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:11.06507587px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.27662691;enable-background:new"
+       style="font-style:normal;font-weight:normal;font-size:11.0651px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.276627;enable-background:new"
        x="144.95157"
        y="71.632065"
        id="text4883-3-7-0"
@@ -983,7 +966,7 @@
          id="tspan4881-7-2-8"
          x="144.95157"
          y="71.632065"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.27662691">SR-IOV</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.276627">SR-IOV</tspan></text>
     <rect
        style="display:inline;fill:#a9d18e;fill-opacity:1;stroke:#000000;stroke-width:0.26458332;stroke-opacity:1"
        id="rect6062-5-1"
@@ -994,7 +977,7 @@
        rx="4.99999" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.58611107px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.58611px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="206.82547"
        y="33.928337"
        id="text6066-5-7"><tspan
@@ -1002,22 +985,21 @@
          id="tspan6064-5-1"
          x="206.82547"
          y="33.928337"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;font-family:Arial;-inkscape-font-specification:Arial;stroke-width:0.26458332">Iperf client</tspan><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:Arial;-inkscape-font-specification:Arial;stroke-width:0.264583">Iperf client</tspan><tspan
          sodipodi:role="line"
          x="206.82547"
          y="39.784184"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;font-family:Arial;-inkscape-font-specification:Arial;stroke-width:0.26458332"
          id="tspan5627-1" /></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.58611107px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.58611px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="206.91074"
        y="43.173389"
        id="text6066-5-66-0"><tspan
          sodipodi:role="line"
          x="206.91074"
          y="43.173389"
-         style="font-size:4.23333311px;stroke-width:0.26458332"
+         style="font-size:4.23333px;stroke-width:0.264583"
          id="tspan5627-5-9">192.168.20.20</tspan></text>
   </g>
   <g
@@ -1036,7 +1018,7 @@
        rx="10.845516" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="33.868488"
        y="15.210441"
        id="text1105"><tspan
@@ -1044,7 +1026,7 @@
          id="tspan1103"
          x="33.868488"
          y="15.210441"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888903px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332">uCPE Device1</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583">uCPE Device1</tspan></text>
     <path
        style="fill:none;stroke:#000000;stroke-width:0.480912;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="M 62.395761,39.457166 H 94.337973"
@@ -1057,7 +1039,7 @@
        inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:11.06507587px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.37;stroke-miterlimit:4;stroke-dasharray:none"
+       style="font-style:normal;font-weight:normal;font-size:11.0651px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.37;stroke-miterlimit:4;stroke-dasharray:none"
        x="85.768204"
        y="71.705055"
        id="text4883-3-7"
@@ -1067,7 +1049,7 @@
          id="tspan4881-7-2"
          x="85.768204"
          y="71.705055"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.37;stroke-miterlimit:4;stroke-dasharray:none">SR-IOV</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.37;stroke-miterlimit:4;stroke-dasharray:none">SR-IOV</tspan></text>
     <g
        style="stroke-width:0.37;stroke-miterlimit:4;stroke-dasharray:none"
        id="g1209"
@@ -1138,10 +1120,10 @@
          id="text6066-5-6"
          y="123.04565"
          x="-29.048643"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.3333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
          xml:space="preserve"><tspan
            id="tspan8402"
-           style="font-size:17.33333397px;stroke-width:0.99999994"
+           style="font-size:17.3333px;stroke-width:1"
            y="123.04565"
            x="-26.644997"
            sodipodi:role="line">Clavister </tspan></text>
diff --git a/doc/book-enea-edge-example-usecases/doc/images/uc_enea_test_vnf.png b/doc/book-enea-edge-example-usecases/doc/images/uc_enea_test_vnf.png
new file mode 100644
index 0000000..be97bc0
--- /dev/null
+++ b/doc/book-enea-edge-example-usecases/doc/images/uc_enea_test_vnf.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_enea_test_vnf.svg b/doc/book-enea-edge-example-usecases/doc/images/uc_enea_test_vnf.svg
index 8e692f2..fc71729 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_enea_test_vnf.svg
+++ b/doc/book-enea-edge-example-usecases/doc/images/uc_enea_test_vnf.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -15,9 +13,9 @@
    viewBox="0 0 221.39921 112.481"
    version="1.1"
    id="svg8"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   inkscape:version="1.0.2 (e86c870, 2021-01-15)"
    sodipodi:docname="uc_enea_test_vnf.svg"
-   inkscape:export-filename="X:\images\uc_enea_test_vnf.png"
+   inkscape:export-filename="D:\ENEA Work files\ENFV work\ENA 2.4\AP-636\uc_enea_test_vnf.png"
    inkscape:export-xdpi="65.025185"
    inkscape:export-ydpi="65.025185"
    style="enable-background:new">
@@ -513,25 +511,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.0610016"
-     inkscape:cx="543.91141"
-     inkscape:cy="26.216313"
+     inkscape:zoom="1.2316035"
+     inkscape:cx="337.42354"
+     inkscape:cy="213.58292"
      inkscape:document-units="mm"
-     inkscape:current-layer="svg8"
+     inkscape:current-layer="layer2"
      showgrid="false"
      inkscape:showpageshadow="false"
      showborder="true"
      showguides="true"
      inkscape:guide-bbox="true"
-     inkscape:window-width="1858"
-     inkscape:window-height="1177"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
-     fit-margin-bottom="0" />
+     fit-margin-bottom="0"
+     inkscape:document-rotation="0" />
   <metadata
      id="metadata5">
     <rdf:RDF>
@@ -575,9 +574,9 @@
          id="text6066"
          y="68.725212"
          x="168.60965"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:8.46666622px;stroke-width:0.26458332"
+           style="font-size:8.46667px;stroke-width:0.264583"
            y="68.725212"
            x="168.60965"
            id="tspan6064"
@@ -591,27 +590,29 @@
      style="display:inline"
      transform="translate(43.000002,-286.11663)">
     <g
-       id="g11688"
-       transform="matrix(0.26458333,0,0,0.26458333,-88.315532,289.3279)">
+       id="g158"
+       inkscape:export-filename="E:\PortableApps\WinSCPPortable\App\winscp\scp57962\nfs\hosts\sestonas06\homes\mrpa\docu_work\NFV-Access\branches\feature_USERDOCAP-636\nfv-access-documentation\doc\book-enea-nfv-access-example-usecases\doc\images\uc_enea_test_vnf.png"
+       inkscape:export-xdpi="65"
+       inkscape:export-ydpi="65">
       <rect
-         rx="23.192089"
-         y="349.04373"
-         x="368.70782"
-         height="63.53022"
-         width="212.60954"
+         rx="7.4362011"
+         y="381.67905"
+         x="3.2798252"
+         height="16.809036"
+         width="68.170113"
          id="rect5992-5"
-         style="fill:#ff9955;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.82807648;stroke-opacity:1" />
+         style="fill:#ff9955;fill-opacity:0.641414;stroke:#000000;stroke-width:0.241189;stroke-opacity:1" />
       <text
          id="text5996-5"
-         y="386.32968"
-         x="474.19489"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.99999809px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+         y="391.50983"
+         x="37.162312"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
            id="tspan5998-2"
-           style="font-size:21.33333397px;stroke-width:0.99999994"
-           y="386.32968"
-           x="474.19489"
-           sodipodi:role="line">uCPE Manager</tspan></text>
+           style="font-size:5.64444px;stroke-width:0.264583"
+           y="391.50983"
+           x="37.162312"
+           sodipodi:role="line">Enea Edge Management</tspan></text>
     </g>
     <g
        transform="matrix(0.26458333,0,0,0.26458333,-91.32444,288.26957)"
@@ -657,9 +658,9 @@
          id="text6011-4"
          y="367.05307"
          x="37.059994"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05555534px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:7.05555534px;stroke-width:0.26458332"
+           style="font-size:7.05556px;stroke-width:0.264583"
            y="367.05307"
            x="37.059994"
            id="tspan6009-5"
@@ -672,7 +673,7 @@
        inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="36.357403"
        y="311.03873"
        id="text11531"><tspan
@@ -680,7 +681,7 @@
          id="tspan11529"
          x="36.357403"
          y="311.03873"
-         style="stroke-width:0.26458332">BTB</tspan></text>
+         style="stroke-width:0.264583">BTB</tspan></text>
   </g>
   <g
      inkscape:groupmode="layer"
@@ -698,14 +699,14 @@
        rx="5.6691012" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="-8.9502325"
        y="289.71228"
        id="text5981-3-7-7"><tspan
          sodipodi:role="line"
          x="-8.9502325"
          y="289.71228"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.264583"
          id="tspan5983-4-5-6">uCPE Device 1</tspan></text>
     <g
        id="g9810-0"
@@ -744,10 +745,10 @@
          id="text6066-5-6"
          y="320.267"
          x="-14.748354"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888903px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
            id="tspan5627-4"
-           style="font-size:4.93888903px;stroke-width:0.26458332"
+           style="font-size:4.93889px;stroke-width:0.264583"
            y="320.267"
            x="-14.748354"
            sodipodi:role="line">pktgen_dpdk</tspan></text>
@@ -809,14 +810,14 @@
        inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="113.53959"
        y="290.06937"
        id="text5981-3-7"><tspan
          sodipodi:role="line"
          x="113.53959"
          y="290.06937"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.264583"
          id="tspan5983-4-5">uCPE Device 2</tspan></text>
     <g
        id="g2590"
@@ -833,10 +834,10 @@
          id="text6066-5-5"
          y="334.9874"
          x="150.85605"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
            id="tspan5627-2"
-           style="font-size:5.64444447px;stroke-width:0.26458332"
+           style="font-size:5.64444px;stroke-width:0.264583"
            y="334.9874"
            x="150.85605"
            sodipodi:role="line">testpmd_fwd</tspan></text>
@@ -851,14 +852,14 @@
        rx="4.99999" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="150.75102"
        y="309.03262"
        id="text6066-5-5-5"><tspan
          sodipodi:role="line"
          x="150.75102"
          y="309.03262"
-         style="font-size:5.64444447px;stroke-width:0.26458332"
+         style="font-size:5.64444px;stroke-width:0.264583"
          id="tspan5627-2-6">testpmd_term</tspan></text>
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:0.47971678;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -911,9 +912,9 @@
          id="text892-7"
          y="-87.169403"
          x="320.57385"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:4.93888855px;writing-mode:lr-tb;stroke-width:0.26458332"
+           style="font-size:4.93889px;writing-mode:lr-tb;stroke-width:0.264583"
            y="-87.169403"
            x="320.57385"
            id="tspan890-2"
@@ -922,9 +923,9 @@
          id="text148"
          y="343.02264"
          x="84.63942"
-         style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583"
            y="343.02264"
            x="84.63942"
            id="tspan146"
@@ -966,35 +967,33 @@
          id="text4338"
          y="284.13779"
          x="-0.59244788"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;filter:url(#filter4332)"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;filter:url(#filter4332)"
          xml:space="preserve"><tspan
            id="tspan4344"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="284.13779"
            x="-0.59244788"
            sodipodi:role="line">Legend: </tspan><tspan
            id="tspan4348"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="320.57343"
            x="-0.59244788"
            sodipodi:role="line">- Connection via cloud/internet:</tspan><tspan
            id="tspan4350"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="357.00906"
            x="-0.59244788"
            sodipodi:role="line">- Back to Back: BTB</tspan><tspan
            id="tspan4651"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="393.4447"
            x="-0.59244788"
            sodipodi:role="line">- Flow rules: </tspan><tspan
            id="tspan4340"
-           style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
            y="420.43878"
            x="-0.59244788"
            sodipodi:role="line" /><tspan
            id="tspan4342"
-           style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
            y="443.77213"
            x="-0.59244788"
            sodipodi:role="line" /></text>
diff --git a/doc/book-enea-edge-example-usecases/doc/images/uc_fortigate_fw.png b/doc/book-enea-edge-example-usecases/doc/images/uc_fortigate_fw.png
new file mode 100644
index 0000000..f8ae39a
--- /dev/null
+++ b/doc/book-enea-edge-example-usecases/doc/images/uc_fortigate_fw.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_fw.svg b/doc/book-enea-edge-example-usecases/doc/images/uc_fortigate_fw.svg
index 191ec5e..160c8b0 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_fw.svg
+++ b/doc/book-enea-edge-example-usecases/doc/images/uc_fortigate_fw.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -14,10 +12,10 @@
    viewBox="0 0 210.00378 81.219772"
    version="1.1"
    id="svg8"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="uc_fortigate_fw_new.svg"
+   inkscape:version="1.0.2 (e86c870, 2021-01-15)"
+   sodipodi:docname="uc_fortigate_fw.svg"
    style="enable-background:new"
-   inkscape:export-filename="E:\Documents\ENEA Work files\ENFV work\ENA 2.2.2\Example Usecase pics\uc_fortigate_fw_new.png"
+   inkscape:export-filename="D:\ENEA Work files\ENFV work\ENA 2.4\AP-636\uc_fortigate_fw.png"
    inkscape:export-xdpi="62.189999"
    inkscape:export-ydpi="62.189999">
   <defs
@@ -430,15 +428,15 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.81640387"
-     inkscape:cx="400.67601"
-     inkscape:cy="137.53467"
+     inkscape:zoom="1.1545694"
+     inkscape:cx="415.37929"
+     inkscape:cy="192.98518"
      inkscape:document-units="mm"
      inkscape:current-layer="layer12"
      showgrid="false"
      inkscape:showpageshadow="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="713"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
@@ -451,7 +449,8 @@
      width="300mm"
      inkscape:snap-global="false"
      showguides="true"
-     inkscape:guide-bbox="true" />
+     inkscape:guide-bbox="true"
+     inkscape:document-rotation="0" />
   <metadata
      id="metadata5">
     <rdf:RDF>
@@ -460,7 +459,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -491,26 +490,16 @@
            id="text15008-4"
            y="60.119961"
            x="53.59409"
-           style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-           xml:space="preserve"><tspan
-             style="fill:#ac9d93;stroke-width:0.26458332"
-             y="69.483727"
-             x="53.59409"
-             id="tspan15006-8"
-             sodipodi:role="line" /><tspan
-             id="tspan15010-2"
-             style="fill:#ac9d93;stroke-width:0.26458332"
-             y="82.712898"
-             x="53.59409"
-             sodipodi:role="line" /></text>
+           style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.264583"
+           xml:space="preserve" />
       </g>
       <text
          id="text4180"
          y="45.066971"
          x="6.3358655"
-         style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583"
            y="45.066971"
            x="6.3358655"
            id="tspan4178"
@@ -525,11 +514,11 @@
      transform="translate(-24.600193,-22.751582)"
      sodipodi:insensitive="true">
     <flowRoot
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:tb-rl;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:tb-rl;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        id="flowRoot4207"
        xml:space="preserve"><flowRegion
          id="flowRegion4209"
-         style="stroke-width:0.26458332"><rect
+         style="stroke-width:0.264583"><rect
            y="45.600235"
            x="114.33484"
            height="6.1890655"
@@ -537,7 +526,8 @@
            id="rect4211"
            style="stroke-width:0.07000434" /></flowRegion><flowPara
          id="flowPara4213"
-         style="stroke-width:0.26458332" /></flowRoot>    <rect
+         style="stroke-width:0.264583" /></flowRoot>
+    <rect
        style="fill:#ffffff;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.31052992;stroke-opacity:1"
        id="rect5977"
        width="97.136261"
@@ -548,15 +538,10 @@
        ry="9.8702631" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:vertical-lr;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:vertical-lr;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="63.08812"
        y="89.025627"
-       id="text1502"><tspan
-         sodipodi:role="line"
-         id="tspan1500"
-         x="89.025627"
-         y="67.05687"
-         style="stroke-width:0.26458332"></tspan></text>
+       id="text1502" />
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:0.3192617;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 140.76137,41.619283 33.63394,0.0069"
@@ -568,9 +553,9 @@
          id="text265-1"
          y="49.513149"
          x="150.1429"
-         style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583"
            y="49.513149"
            x="150.1429"
            id="tspan263-9"
@@ -589,7 +574,7 @@
            ry="9.7688789" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="654.4104"
            y="150.88129"
            id="text892-7-8-9"><tspan
@@ -597,7 +582,7 @@
              id="tspan890-2-1-9"
              x="654.4104"
              y="150.88129"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">wan_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">wan_br</tspan></text>
       </g>
     </g>
     <path
@@ -612,9 +597,9 @@
          id="text265"
          y="96.958344"
          x="55.008671"
-         style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583"
            y="96.958344"
            x="55.008671"
            id="tspan263"
@@ -633,7 +618,7 @@
            ry="2.5839915" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
            x="62.570286"
            y="88.203476"
            id="text892-7-06-88"><tspan
@@ -641,7 +626,7 @@
              id="tspan890-2-0-9"
              x="62.570286"
              y="88.203476"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.26458332">lan1_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.264583">lan1_br</tspan></text>
       </g>
     </g>
     <path
@@ -656,9 +641,9 @@
          id="text265-3"
          y="96.955482"
          x="75.671005"
-         style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;enable-background:new"
+         style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;enable-background:new"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583"
            y="96.955482"
            x="75.671005"
            id="tspan263-5"
@@ -676,7 +661,7 @@
            ry="2.5839915" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;enable-background:new"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;enable-background:new"
            x="85.373268"
            y="89.924515"
            id="text892-7-06-88-2"><tspan
@@ -684,7 +669,7 @@
              id="tspan890-2-0-9-9"
              x="85.373268"
              y="89.924515"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.26458332">lan2_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.264583">lan2_br</tspan></text>
       </g>
     </g>
     <rect
@@ -697,7 +682,7 @@
        rx="3.6602547" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="127.82442"
        y="50.472015"
        id="text1458-5"><tspan
@@ -705,7 +690,7 @@
          x="127.82442"
          y="50.472015"
          id="tspan1460-5"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:Arial;-inkscape-font-specification:Arial;stroke-width:0.26458332">Fortigate</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:Arial;-inkscape-font-specification:Arial;stroke-width:0.264583">Fortigate</tspan></text>
     <rect
        style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.24650952;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
        id="rect5977-9-8-71-3-5"
@@ -726,14 +711,14 @@
        transform="scale(1,-1)" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="127.12518"
        y="25.319901"
        id="text5981-3-7-2"><tspan
          sodipodi:role="line"
          x="127.12518"
          y="25.319901"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.264583"
          id="tspan5983-4-5-0">uCPE Device</tspan></text>
   </g>
   <g
@@ -754,7 +739,8 @@
            height="71.385147"
            x="73.126244"
            y="-106.76833" /></flowRegion><flowPara
-         id="flowPara1101" /></flowRoot>    <flowRoot
+         id="flowPara1101" /></flowRoot>
+    <flowRoot
        transform="translate(45.709914,33.087017)"
        xml:space="preserve"
        id="flowRoot1107"
@@ -765,17 +751,13 @@
            height="156.6991"
            x="128.84148"
            y="-61.499702" /></flowRegion><flowPara
-         id="flowPara1113" /></flowRoot>    <text
+         id="flowPara1113" /></flowRoot>
+    <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="63.141701"
        y="70.058487"
-       id="text6115"><tspan
-         sodipodi:role="line"
-         id="tspan6113"
-         x="63.141701"
-         y="79.422256"
-         style="stroke-width:0.26458332" /></text>
+       id="text6115" />
     <g
        id="g1482"
        transform="translate(-10.990187,-5.5412151)">
@@ -785,7 +767,7 @@
          style="display:inline">
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;filter:url(#filter4332)"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;filter:url(#filter4332)"
            x="-0.59244788"
            y="284.13779"
            id="text4338"
@@ -793,29 +775,26 @@
              sodipodi:role="line"
              x="-0.59244788"
              y="284.13779"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4344">Legend: </tspan><tspan
              id="tspan1311"
              sodipodi:role="line"
              x="-0.59244788"
              y="322.9603"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.79837799px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"><tspan
-   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.7984px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"><tspan
+   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
    id="tspan1469">- Connection via cloud/internet:</tspan> </tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="350.87982"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4651" /><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="374.21317"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4340" /><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="397.54651"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4342" /></text>
       </g>
       <g
@@ -851,10 +830,11 @@
            height="43.090054"
            x="27.085176"
            y="256.68076" /></flowRegion><flowPara
-         id="flowPara4176">Test</flowPara></flowRoot>    <flowRoot
+         id="flowPara4176">Test</flowPara></flowRoot>
+    <flowRoot
        xml:space="preserve"
        id="flowRoot4685"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
        transform="scale(0.26458333)"><flowRegion
          id="flowRegion4687"><rect
            id="rect4689"
@@ -862,27 +842,19 @@
            height="36.934334"
            x="790.39471"
            y="328.7027" /></flowRegion><flowPara
-         id="flowPara4691" /></flowRoot>    <path
-       style="display:inline;opacity:1;fill:none;stroke:#000000;stroke-width:0.36356106;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.72712207, 0.36356105, 0.18178051, 0.36356105;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
+         id="flowPara4691" /></flowRoot>
+    <path
+       style="display:inline;opacity:1;fill:none;stroke:#000000;stroke-width:0.363561;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.727122, 0.363561, 0.181781, 0.363561;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
        d="M 210.06435,61.711725 V 79.966961"
        id="path8471-8"
        inkscape:connector-curvature="0" />
-    <rect
-       ry="4.2375026"
-       style="fill:#ff9955;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.21806791;stroke-opacity:1"
-       id="rect5992-9-0"
-       width="39.340992"
-       height="23.810053"
-       x="190.41014"
-       y="80.052269"
-       rx="4.2914338" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:0.33103764;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.66207523, 0.33103761, 0.16551882, 0.33103761;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.331038;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.662075, 0.331038, 0.165519, 0.331038;stroke-dashoffset:0;stroke-opacity:1"
        d="m 196.32243,57.524306 h -19.398"
        id="path8471-3-0-3-8"
        inkscape:connector-curvature="0" />
     <rect
-       style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.24650952;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.24651;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect5977-9-8-71-3"
        width="2.9787803"
        height="6.1577935"
@@ -891,12 +863,12 @@
        rx="0.32715935"
        transform="scale(1,-1)" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:0.33103764;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.66207523, 0.33103761, 0.16551882, 0.33103761;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.331038;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.662075, 0.331038, 0.165519, 0.331038;stroke-dashoffset:0;stroke-opacity:1"
        d="m 196.26268,41.636225 h -19.398"
        id="path8471-3-0-3-8-9"
        inkscape:connector-curvature="0" />
     <rect
-       style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.24650952;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.24651;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect5977-9-8-71-3-9"
        width="2.9787803"
        height="6.1577935"
@@ -905,13 +877,13 @@
        rx="0.32715935"
        transform="scale(1,-1)" />
     <path
-       style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.25427502;stroke-opacity:1"
+       style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.254275;stroke-opacity:1"
        d="m 211.52785,26.000497 a 10.280439,13.97151 0 0 0 -6.72428,3.426249 7.3750976,7.798052 0 0 0 -1.54476,-0.177046 7.3750976,7.798052 0 0 0 -6.32445,3.804457 10.239768,11.447616 0 0 0 -1.01007,-0.05647 10.239768,11.447616 0 0 0 -10.23984,11.447682 10.239768,11.447616 0 0 0 2.7661,7.812005 5.1402199,5.5236202 0 0 0 -0.16543,1.361221 5.1402199,5.5236202 0 0 0 5.14021,5.523629 5.1402199,5.5236202 0 0 0 1.80232,-0.35348 4.6932442,9.0977274 0 0 0 3.11442,2.302999 4.6932442,9.0977274 0 0 0 2.66133,-1.616355 8.4925367,9.7475653 0 0 0 6.05469,2.916023 8.4925367,9.7475653 0 0 0 6.56801,-3.577265 12.515318,8.1229707 0 0 0 5.94732,0.977913 12.515318,8.1229707 0 0 0 12.51531,-8.122967 12.515318,8.1229707 0 0 0 -0.74424,-2.735776 9.6866648,9.0977274 0 0 0 3.13233,-6.686873 9.6866648,9.0977274 0 0 0 -9.68636,-9.097724 9.6866648,9.0977274 0 0 0 -3.99049,0.819912 10.280439,13.97151 0 0 0 -9.27212,-7.96812 z"
        id="path5091-2-9"
        inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="199.03485"
        y="46.431309"
        id="text4180-9-8-7"><tspan
@@ -919,20 +891,50 @@
          id="tspan4178-6-6-2"
          x="199.03485"
          y="46.431309"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332">Internet</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583">Internet</tspan></text>
     <flowRoot
        xml:space="preserve"
        id="flowRoot2130"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
-       transform="matrix(0.23662585,0,0,0.23365212,70.806276,-5.7897538)"><flowRegion
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+       transform="matrix(0.4543271,0,0,0.23365212,-57.332226,-5.7897538)"><flowRegion
          id="flowRegion2132"><rect
            id="rect2134"
            width="118.79844"
            height="68.571358"
            x="528.01184"
            y="384.12811" /></flowRegion><flowPara
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.00584602px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle"
-         id="flowPara2136">uCPE</flowPara><flowPara
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.00584602px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle"
-         id="flowPara2138">Manager</flowPara></flowRoot>  </g>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.0058px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle"
+         id="flowPara2138" /></flowRoot>
+    <g
+       id="g188"
+       inkscape:export-filename="E:\PortableApps\WinSCPPortable\App\winscp\scp01954\nfs\hosts\sestonas06\homes\mrpa\docu_work\NFV-Access\branches\feature_USERDOCAP-636\nfv-access-documentation\doc\book-enea-nfv-access-example-usecases\doc\images\uc_fortigate_fw.png"
+       inkscape:export-xdpi="62"
+       inkscape:export-ydpi="62">
+      <rect
+         ry="4.2313652"
+         style="fill:#ff9955;fill-opacity:0.641414;stroke:#000000;stroke-width:0.252553;stroke-opacity:1"
+         id="rect5992-9-0"
+         width="52.844162"
+         height="23.775566"
+         x="183.65855"
+         y="80.069511"
+         rx="5.7644005" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-weight:normal;font-size:6.35px;line-height:1.25;font-family:sans-serif;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         x="209.83569"
+         y="89.745026"
+         id="text160"><tspan
+           sodipodi:role="line"
+           id="tspan158"
+           x="209.83569"
+           y="89.745026"
+           style="font-size:6.35px;text-align:center;text-anchor:middle;stroke-width:0.264583">Enea Edge </tspan><tspan
+           sodipodi:role="line"
+           x="209.83569"
+           y="97.682526"
+           style="font-size:6.35px;text-align:center;text-anchor:middle;stroke-width:0.264583"
+           id="tspan162">Management</tspan></text>
+    </g>
+  </g>
 </svg>
diff --git a/doc/book-enea-edge-example-usecases/doc/images/uc_fortigate_sdwan.png b/doc/book-enea-edge-example-usecases/doc/images/uc_fortigate_sdwan.png
new file mode 100644
index 0000000..b71b02e
--- /dev/null
+++ b/doc/book-enea-edge-example-usecases/doc/images/uc_fortigate_sdwan.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.svg b/doc/book-enea-edge-example-usecases/doc/images/uc_fortigate_sdwan.svg
index 4255bf6..3de54dd 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.svg
+++ b/doc/book-enea-edge-example-usecases/doc/images/uc_fortigate_sdwan.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -16,8 +14,8 @@
    height="482.41965"
    viewBox="0 0 830.09292 482.41966"
    sodipodi:docname="uc_fortigate_sdwan.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   inkscape:export-filename="L:\docu_work\el_releases-nfv-access\doc\book-enea-nfv-access-example-usecases\doc\images\uc_fortigate_sdwan.png"
+   inkscape:version="1.0.2 (e86c870, 2021-01-15)"
+   inkscape:export-filename="D:\ENEA Work files\ENFV work\ENA 2.4\AP-636\uc_fortigate_sdwan.png"
    inkscape:export-xdpi="65.519997"
    inkscape:export-ydpi="65.519997">
   <metadata
@@ -430,17 +428,17 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="713"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
      id="namedview4"
      showgrid="false"
      inkscape:zoom="1.0074671"
-     inkscape:cx="429.30796"
-     inkscape:cy="215.58101"
+     inkscape:cx="419.71809"
+     inkscape:cy="299.93679"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:current-layer="layer3"
+     inkscape:current-layer="layer5"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
@@ -448,7 +446,8 @@
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:showpageshadow="false"
-     showborder="false" />
+     showborder="false"
+     inkscape:document-rotation="0" />
   <g
      inkscape:groupmode="layer"
      id="layer1"
@@ -485,7 +484,7 @@
          id="g5968">
         <text
            xml:space="preserve"
-           style="font-style:normal;font-weight:normal;font-size:8.46666622px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+           style="font-style:normal;font-weight:normal;font-size:8.46667px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
            x="18.006182"
            y="21.814686"
            id="text5964"><tspan
@@ -493,7 +492,7 @@
              id="tspan5962"
              x="18.006182"
              y="21.814686"
-             style="font-size:8.46666622px;stroke-width:0.26458332">Cloud</tspan></text>
+             style="font-size:8.46667px;stroke-width:0.264583">Cloud</tspan></text>
       </g>
     </g>
     <rect
@@ -507,7 +506,7 @@
        ry="22.677166" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.99999809px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="876.67236"
        y="570.11469"
        id="text5981"><tspan
@@ -515,11 +514,11 @@
          id="tspan5979"
          x="876.67236"
          y="570.11469"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.99999809px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.99999994">uCPE</tspan><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:1">uCPE</tspan><tspan
          sodipodi:role="line"
          x="876.67236"
          y="610.11469"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.99999809px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:1"
          id="tspan5983">Device</tspan></text>
     <g
        transform="matrix(3.7795276,0,0,3.7795276,428.74031,418.42027)"
@@ -538,15 +537,15 @@
          id="text5996"
          y="62.470726"
          x="35.614925"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="stroke-width:0.26458332"
+           style="stroke-width:0.264583"
            y="62.470726"
            x="35.614925"
            id="tspan5994"
            sodipodi:role="line">uCPE</tspan><tspan
            id="tspan5998"
-           style="stroke-width:0.26458332"
+           style="stroke-width:0.264583"
            y="73.054062"
            x="35.614925"
            sodipodi:role="line">Manager</tspan></text>
@@ -568,9 +567,9 @@
          id="text6011"
          y="111.3953"
          x="104.96505"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="stroke-width:0.26458332"
+           style="stroke-width:0.264583"
            y="111.3953"
            x="104.96505"
            id="tspan6009"
@@ -593,9 +592,9 @@
          id="text6054"
          y="36.242371"
          x="174.40106"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:8.46666622px;stroke-width:0.26458332"
+           style="font-size:8.46667px;stroke-width:0.264583"
            y="36.242371"
            x="174.40106"
            id="tspan6052"
@@ -618,9 +617,9 @@
          id="text6066"
          y="68.725212"
          x="168.60965"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:8.46666622px;stroke-width:0.26458332"
+           style="font-size:8.46667px;stroke-width:0.264583"
            y="68.725212"
            x="168.60965"
            id="tspan6064"
@@ -644,9 +643,9 @@
          id="text892"
          y="-24.028263"
          x="158.336"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:8.46666622px;writing-mode:lr-tb;stroke-width:0.26458332"
+           style="font-size:8.46667px;writing-mode:lr-tb;stroke-width:0.264583"
            y="-24.028263"
            x="158.336"
            id="tspan890"
@@ -718,53 +717,45 @@
      id="layer5"
      inkscape:label="btb, internet, ucpe manager"
      transform="translate(-23.865391,-45.497822)"
-     style="display:inline">
+     style="display:inline"
+     sodipodi:insensitive="true">
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.3060993;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.6121985, 1.30609926, 0.65304962, 1.30609926;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.3061;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.6122, 1.3061, 0.65305, 1.3061;stroke-dashoffset:0;stroke-opacity:1"
        d="m 492.68784,161.04591 v 79.89453"
        id="path8471-3-0-5-4-7-6-3"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.29300523;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.58601049, 1.29300525, 0.64650262, 1.29300525;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.29301;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.58601, 1.29301, 0.646503, 1.29301;stroke-dashoffset:0;stroke-opacity:1"
        d="M 440.34086,288.13958 V 209.83895"
        id="path8471-3-0"
        inkscape:connector-curvature="0" />
-    <rect
-       ry="16.015759"
-       style="fill:#ff9955;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.82419372;stroke-opacity:1"
-       id="rect5992-9"
-       width="148.69037"
-       height="89.990753"
-       x="365.99567"
-       y="288.93851"
-       rx="16.219593" />
     <path
-       style="display:inline;fill:#fa5555;fill-opacity:1;stroke:#f30000;stroke-width:1.2484287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:#fa5555;fill-opacity:1;stroke:#f30000;stroke-width:1.24843;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 569.66925,124.00658 -51.10954,0.012"
        id="path8471-3-2-5-5-4-6-9-8"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.3063972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.61279433, 1.30639717, 0.65319858, 1.30639717;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.3064;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.61279, 1.3064, 0.653199, 1.3064;stroke-dashoffset:0;stroke-opacity:1"
        d="m 389.31534,159.12973 v 79.93098"
        id="path8471-3-0-5-4-7-6-3-0"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.3063972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.61279433, 1.30639717, 0.65319858, 1.30639717;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.3064;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.61279, 1.3064, 0.653199, 1.3064;stroke-dashoffset:0;stroke-opacity:1"
        d="M 389.33652,181.0334 H 309.40554"
        id="path8471-3-0-5-2"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.3063972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.61279433, 1.30639717, 0.65319858, 1.30639717;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.3064;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.61279, 1.3064, 0.653199, 1.3064;stroke-dashoffset:0;stroke-opacity:1"
        d="M 568.52125,182.74033 H 488.59028"
        id="path8471-3-0-5-2-4"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;fill:#fa5555;fill-opacity:1;stroke:#f30000;stroke-width:1.21068478;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:#fa5555;fill-opacity:1;stroke:#f30000;stroke-width:1.21068;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 853.95759,519.79962 -30.03505,0.0338"
        id="path8471-3-2-5-5-4-6-9-7"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;fill:#fa5555;fill-opacity:1;stroke:#f30000;stroke-width:1.2484287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:#fa5555;fill-opacity:1;stroke:#f30000;stroke-width:1.24843;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 355.88704,123.01486 -51.10954,0.012"
        id="path8471-3-2-5-5-4-6-9-8-8"
        inkscape:connector-curvature="0" />
@@ -774,64 +765,73 @@
          inkscape:connector-curvature="0"
          id="path5091-2"
          d="m 445.81065,75.822009 a 38.855204,52.805708 0 0 0 -25.4146,12.949601 27.874385,29.472953 0 0 0 -5.83847,-0.669151 27.874385,29.472953 0 0 0 -23.90343,14.379051 38.701484,43.266581 0 0 0 -3.81757,-0.21342 38.701484,43.266581 0 0 0 -38.70176,43.26683 38.701484,43.266581 0 0 0 10.45454,29.52569 19.427603,20.876675 0 0 0 -0.62526,5.14477 19.427603,20.876675 0 0 0 19.42759,20.87671 19.427603,20.876675 0 0 0 6.81189,-1.33599 17.738246,34.385112 0 0 0 11.77104,8.70425 17.738246,34.385112 0 0 0 10.05859,-6.10906 32.097777,36.841192 0 0 0 22.88385,11.02119 32.097777,36.841192 0 0 0 24.82399,-13.52037 47.301991,30.700992 0 0 0 22.47804,3.69605 47.301991,30.700992 0 0 0 47.30198,-30.70098 47.301991,30.700992 0 0 0 -2.81288,-10.33994 36.611017,34.385112 0 0 0 11.83871,-25.27322 36.611017,34.385112 0 0 0 -36.60986,-34.3851 36.611017,34.385112 0 0 0 -15.08215,3.09888 38.855204,52.805708 0 0 0 -35.04424,-30.11573 z"
-         style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.96103942;stroke-opacity:1" />
+         style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.961039;stroke-opacity:1" />
       <text
          id="text4180-9-8-7"
          y="153.04083"
          x="398.5928"
-         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="153.04083"
            x="398.5928"
            id="tspan4178-6-6-2"
            sodipodi:role="line">Internet</tspan></text>
     </g>
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2130"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
-       transform="matrix(0.89433392,0,0,0.88309463,-86.050427,-35.503783)"><flowRegion
-         id="flowRegion2132"><rect
-           id="rect2134"
-           width="118.79844"
-           height="68.571358"
-           x="528.01184"
-           y="384.12811" /></flowRegion><flowPara
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.00584412px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle"
-         id="flowPara2136">uCPE</flowPara><flowPara
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.00584412px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle"
-         id="flowPara2138">Manager</flowPara></flowRoot>  </g>
+    <g
+       id="g247">
+      <rect
+         ry="16.015759"
+         style="fill:#ff9955;fill-opacity:0.641414;stroke:#000000;stroke-width:0.886108;stroke-opacity:1"
+         id="rect5992-9"
+         width="171.86906"
+         height="89.990753"
+         x="354.40631"
+         y="288.93851"
+         rx="18.747995" />
+      <flowRoot
+         xml:space="preserve"
+         id="flowRoot2130"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.0039px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+         transform="matrix(1.3924524,0,0,1.3749531,-378.43971,-225.73956)"><flowRegion
+           id="flowRegion2132"><rect
+             id="rect2134"
+             width="118.79844"
+             height="68.571358"
+             x="528.01184"
+             y="384.12811"
+             style="stroke-width:1;" /></flowRegion><flowPara
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.0039px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle"
+           id="flowPara2138">Enea Edge Management</flowPara></flowRoot>
+    </g>
+  </g>
   <g
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="uCPE Device 2"
      transform="translate(-206.89353,53.60331)"
-     style="display:inline">
+     style="display:inline"
+     sodipodi:insensitive="true">
     <text
        xml:space="preserve"
        style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
        x="1111.8201"
        y="185.74878"
-       id="text16006"><tspan
-         sodipodi:role="line"
-         id="tspan16004"
-         x="1111.8201"
-         y="221.1394" /></text>
+       id="text16006" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="895.67767"
        y="-42.627693"
        id="text5981-3-7"><tspan
          sodipodi:role="line"
          x="895.67767"
          y="-42.627693"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1"
          id="tspan5983-4-5">uCPE Device 2</tspan></text>
     <rect
        transform="scale(-1,1)"
-       style="display:inline;fill:#ffffff;fill-opacity:0.64141415;stroke:#000000;stroke-width:1.34585321;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="display:inline;fill:#ffffff;fill-opacity:0.641414;stroke:#000000;stroke-width:1.34585;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect5977-6-3-4-3"
        width="281.12839"
        height="239.35895"
@@ -840,12 +840,12 @@
        rx="30.934816"
        ry="30.030743" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23700833;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23701;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 947.78223,253.10428 -0.023,-146.22781"
        id="path8471-3-2-5-5-29-0"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.22999537;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 886.95565,83.624017 -123.61367,0.03037"
        id="path8471-3-2-5-5-2-3"
        inkscape:connector-curvature="0" />
@@ -878,7 +878,7 @@
          ry="1.8328245" />
     </g>
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.27529097;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.55058213, 1.27529107, 0.63764553, 1.27529107;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.27529;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.55058, 1.27529, 0.637646, 1.27529;stroke-dashoffset:0;stroke-opacity:1"
        d="M 751.77066,141.52555 H 675.71628"
        id="path8471-3-0-5-7"
        inkscape:connector-curvature="0" />
@@ -917,7 +917,7 @@
          id="g1507">
         <rect
            ry="9.5910397"
-           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.45560217;stroke-opacity:1"
+           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.455602;stroke-opacity:1"
            id="rect6098-9-0-0"
            width="99.182129"
            height="40.239689"
@@ -927,7 +927,7 @@
            transform="scale(-1,1)" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="825.0979"
            y="85.985962"
            id="text892-7-06-8"><tspan
@@ -935,7 +935,7 @@
              id="tspan890-2-0-4"
              x="825.0979"
              y="85.985962"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">vnfmgmt_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">vnfmgmt_br</tspan></text>
       </g>
       <text
          id="text265-7"
@@ -943,7 +943,7 @@
          x="811.77759"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="111.9693"
            x="811.77759"
            id="tspan263-29"
@@ -959,22 +959,22 @@
          height="110.76262"
          width="124.50654"
          id="rect6062-3-1-3"
-         style="fill:#a9d18e;fill-opacity:1;stroke:#000000;stroke-width:1.09172344;stroke-opacity:1"
+         style="fill:#a9d18e;fill-opacity:1;stroke:#000000;stroke-width:1.09172;stroke-opacity:1"
          ry="13.834034" />
       <text
          id="text4180-9-8"
          y="56.970852"
          x="900.65613"
-         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="56.970852"
            x="900.65613"
            id="tspan4178-6-6"
            sodipodi:role="line">Fortigate</tspan></text>
     </g>
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.22999537;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 886.77714,25.395776 -123.61367,0.03037"
        id="path8471-3-2-5-5-2-3-0"
        inkscape:connector-curvature="0" />
@@ -988,15 +988,15 @@
          height="40.235157"
          width="69.460823"
          id="rect6098-9-0-8-7"
-         style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.44231871;stroke-opacity:1"
+         style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.442319;stroke-opacity:1"
          ry="9.5899591" />
       <text
          id="text892-7-06-6"
          y="29.063463"
          x="824.68774"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1"
            y="29.063463"
            x="824.68774"
            id="tspan890-2-0-48"
@@ -1007,7 +1007,7 @@
          x="811.77759"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="56.039993"
            x="811.77759"
            id="tspan263-0"
@@ -1021,7 +1021,7 @@
          x="912.22858"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="182.38129"
            x="912.22858"
            id="tspan263"
@@ -1031,7 +1031,7 @@
          style="display:inline"
          transform="translate(834.25256,-97.63017)">
         <rect
-           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.4464258;stroke-opacity:1"
+           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.446426;stroke-opacity:1"
            id="rect6098-9-2-8"
            width="69.460823"
            height="40.985825"
@@ -1041,7 +1041,7 @@
            ry="9.7688789" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="112.90489"
            y="253.41431"
            id="text892-7-06-88"><tspan
@@ -1049,7 +1049,7 @@
              id="tspan890-2-0-9"
              x="112.90489"
              y="253.41431"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">lan_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">lan_br</tspan></text>
       </g>
     </g>
   </g>
@@ -1058,27 +1058,18 @@
      id="layer7"
      inkscape:label="Test Machines"
      style="display:inline"
-     transform="translate(-314.7295,-31.73299)">
+     transform="translate(-314.7295,-31.73299)"
+     sodipodi:insensitive="true">
     <g
        style="fill:#ac9d93"
        id="g6108-0"
        transform="matrix(3.0761692,0,0,3.7814034,-32.512633,-85.890206)">
       <text
          xml:space="preserve"
-         style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.264583"
          x="53.59409"
          y="60.119961"
-         id="text15008-4"><tspan
-           sodipodi:role="line"
-           id="tspan15006-8"
-           x="53.59409"
-           y="69.483727"
-           style="fill:#ac9d93;stroke-width:0.26458332" /><tspan
-           sodipodi:role="line"
-           x="53.59409"
-           y="82.712898"
-           style="fill:#ac9d93;stroke-width:0.26458332"
-           id="tspan15010-2" /></text>
+         id="text15008-4" />
     </g>
     <g
        id="g1510"
@@ -1088,7 +1079,7 @@
          id="g6108-0-4"
          style="fill:#ac9d93">
         <rect
-           style="fill:#ac9d93;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.25908634;stroke-opacity:1"
+           style="fill:#ac9d93;fill-opacity:0.641414;stroke:#000000;stroke-width:0.259086;stroke-opacity:1"
            id="rect5992-4-8"
            width="55.009563"
            height="24.0366"
@@ -1100,26 +1091,16 @@
            id="text15008-4-9"
            y="60.119961"
            x="53.59409"
-           style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-           xml:space="preserve"><tspan
-             style="fill:#ac9d93;stroke-width:0.26458332"
-             y="69.483727"
-             x="53.59409"
-             id="tspan15006-8-0"
-             sodipodi:role="line" /><tspan
-             id="tspan15010-2-6"
-             style="fill:#ac9d93;stroke-width:0.26458332"
-             y="82.712898"
-             x="53.59409"
-             sodipodi:role="line" /></text>
+           style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.264583"
+           xml:space="preserve" />
       </g>
       <text
          id="text4180-9"
          y="392.58759"
          x="983.2702"
-         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="392.58759"
            x="983.2702"
            id="tspan4178-6"
@@ -1134,7 +1115,7 @@
          id="g6108-0-4-0"
          style="fill:#ac9d93">
         <rect
-           style="fill:#ac9d93;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.25908634;stroke-opacity:1"
+           style="fill:#ac9d93;fill-opacity:0.641414;stroke:#000000;stroke-width:0.259086;stroke-opacity:1"
            id="rect5992-4-8-1"
            width="55.009563"
            height="24.0366"
@@ -1146,26 +1127,16 @@
            id="text15008-4-9-6"
            y="60.119961"
            x="53.59409"
-           style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-           xml:space="preserve"><tspan
-             style="fill:#ac9d93;stroke-width:0.26458332"
-             y="69.483727"
-             x="53.59409"
-             id="tspan15006-8-0-6"
-             sodipodi:role="line" /><tspan
-             id="tspan15010-2-6-1"
-             style="fill:#ac9d93;stroke-width:0.26458332"
-             y="82.712898"
-             x="53.59409"
-             sodipodi:role="line" /></text>
+           style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.264583"
+           xml:space="preserve" />
       </g>
       <text
          id="text4180-9-1"
          y="392.58759"
          x="983.2702"
-         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="392.58759"
            x="983.2702"
            id="tspan4178-6-8"
@@ -1177,9 +1148,10 @@
      id="layer4"
      inkscape:label="uCPE Device 1"
      transform="translate(-23.865391,-45.497822)"
-     style="display:inline">
+     style="display:inline"
+     sodipodi:insensitive="true">
     <rect
-       style="display:inline;fill:#ffffff;fill-opacity:0.64141415;stroke:#000000;stroke-width:1.37003899;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="display:inline;fill:#ffffff;fill-opacity:0.641414;stroke:#000000;stroke-width:1.37004;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect5977-6-3-4"
        width="281.05768"
        height="238.16554"
@@ -1188,7 +1160,7 @@
        rx="32.21727"
        ry="29.881014" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.22999537;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 298.04539,180.93127 -123.61367,0.0304"
        id="path8471-3-2-5-5-2-3-0-4-8"
        inkscape:connector-curvature="0" />
@@ -1222,23 +1194,23 @@
     </g>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="165.88004"
        y="55.204853"
        id="text5981-3-7-7"><tspan
          sodipodi:role="line"
          x="165.88004"
          y="55.204853"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1"
          id="tspan5983-4-5-6">uCPE Device 1</tspan></text>
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.22999537;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 296.7775,123.21848 -123.61367,0.0304"
        id="path8471-3-2-5-5-2-3-0-4"
        inkscape:connector-curvature="0" />
     <rect
        ry="13.834034"
-       style="fill:#a9d18e;fill-opacity:1;stroke:#000000;stroke-width:1.09172344;stroke-opacity:1"
+       style="fill:#a9d18e;fill-opacity:1;stroke:#000000;stroke-width:1.09172;stroke-opacity:1"
        id="rect6062-3-1"
        width="124.50654"
        height="110.76262"
@@ -1246,7 +1218,7 @@
        y="94.626221"
        rx="13.834034" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23712945;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23713;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 113.52967,352.093 -0.023,-147.02781"
        id="path8471-3-2-5-5-29-0-3"
        inkscape:connector-curvature="0" />
@@ -1270,7 +1242,7 @@
          transform="translate(-3.3059349,7.7197473)"
          id="g1576">
         <rect
-           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.44231871;stroke-opacity:1"
+           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.442319;stroke-opacity:1"
            id="rect6098-9-0-8"
            width="69.460823"
            height="40.235157"
@@ -1280,7 +1252,7 @@
            ry="9.5899591" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="240.43568"
            y="119.65066"
            id="text892-7-8-1"><tspan
@@ -1288,7 +1260,7 @@
              id="tspan890-2-1-5"
              x="240.43568"
              y="119.65066"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">wan_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">wan_br</tspan></text>
       </g>
       <text
          id="text265-0"
@@ -1296,7 +1268,7 @@
          x="223.73131"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="153.33401"
            x="223.73131"
            id="tspan263-2"
@@ -1307,7 +1279,7 @@
       <g
          id="g1625">
         <rect
-           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.4464258;stroke-opacity:1"
+           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.446426;stroke-opacity:1"
            id="rect6098-9-2"
            width="69.460823"
            height="40.985825"
@@ -1317,7 +1289,7 @@
            ry="9.7688789" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="112.90489"
            y="253.41431"
            id="text892-7-06"><tspan
@@ -1325,7 +1297,7 @@
              id="tspan890-2-0"
              x="112.90489"
              y="253.41431"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">lan_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">lan_br</tspan></text>
       </g>
       <text
          id="text265-8"
@@ -1333,7 +1305,7 @@
          x="122.01346"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="281.41678"
            x="122.01346"
            id="tspan263-1"
@@ -1344,17 +1316,13 @@
        style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
        x="227.95877"
        y="622.30133"
-       id="text1355"><tspan
-         sodipodi:role="line"
-         id="tspan1353"
-         x="227.95877"
-         y="657.69196" /></text>
+       id="text1355" />
     <g
        id="g1756">
       <g
          id="g1611">
         <rect
-           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.46265486;stroke-opacity:1"
+           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.462655;stroke-opacity:1"
            id="rect6098-9-0"
            width="100.74141"
            height="40.235157"
@@ -1364,7 +1332,7 @@
            ry="9.5899591" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="237.05164"
            y="185.0871"
            id="text892-7-8"><tspan
@@ -1372,7 +1340,7 @@
              id="tspan890-2-1"
              x="237.05164"
              y="185.0871"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">vnfmgmt_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">vnfmgmt_br</tspan></text>
       </g>
       <text
          id="text265-3"
@@ -1380,7 +1348,7 @@
          x="223.73131"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="210.3636"
            x="223.73131"
            id="tspan263-06"
@@ -1388,7 +1356,7 @@
     </g>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="65.647079"
        y="156.07199"
        id="text4180-9-8-8"><tspan
@@ -1396,9 +1364,9 @@
          id="tspan4178-6-6-9"
          x="65.647079"
          y="156.07199"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994">Fortigate</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1">Fortigate</tspan></text>
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.27529097;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.55058213, 1.27529107, 0.63764553, 1.27529107;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.27529;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.55058, 1.27529, 0.637646, 1.27529;stroke-dashoffset:0;stroke-opacity:1"
        d="M 388.96711,239.06071 H 312.91273"
        id="path8471-3-0-5-7-8"
        inkscape:connector-curvature="0" />
@@ -1422,7 +1390,8 @@
      id="layer13"
      inkscape:label="Legend"
      transform="translate(-23.865391,-45.497822)"
-     style="display:inline">
+     style="display:inline"
+     sodipodi:insensitive="true">
     <g
        id="g1353"
        transform="translate(22,-2)">
@@ -1431,38 +1400,35 @@
          id="text4338"
          y="284.13779"
          x="-0.59244788"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;filter:url(#filter4332)"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;filter:url(#filter4332)"
          xml:space="preserve"><tspan
            id="tspan4344"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="284.13779"
            x="-0.59244788"
            sodipodi:role="line">Legend: </tspan><tspan
            id="tspan4348"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="320.57343"
            x="-0.59244788"
            sodipodi:role="line">- Connection via cloud/internet:</tspan><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.79837799px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.7984px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="359.39594"
            x="-0.59244788"
            sodipodi:role="line"
            id="tspan1311"><tspan
-   style="font-size:29.14851379px"
+   style="font-size:29.1485px"
    id="tspan1379">- VPN/BTB:</tspan> </tspan><tspan
            id="tspan4651"
-           style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
-           y="387.31546"
+           y="387.31552"
            x="-0.59244788"
            sodipodi:role="line" /><tspan
            id="tspan4340"
-           style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
-           y="410.6488"
+           y="410.6489"
            x="-0.59244788"
            sodipodi:role="line" /><tspan
            id="tspan4342"
-           style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
-           y="433.98215"
+           y="433.98227"
            x="-0.59244788"
            sodipodi:role="line" /></text>
     </g>
diff --git a/doc/book-enea-edge-example-usecases/doc/images/uc_vnf_chaining.png b/doc/book-enea-edge-example-usecases/doc/images/uc_vnf_chaining.png
new file mode 100644
index 0000000..6aaf4c0
--- /dev/null
+++ b/doc/book-enea-edge-example-usecases/doc/images/uc_vnf_chaining.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_vnf_chaining.svg b/doc/book-enea-edge-example-usecases/doc/images/uc_vnf_chaining.svg
index 67e0250..2bb15af 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_vnf_chaining.svg
+++ b/doc/book-enea-edge-example-usecases/doc/images/uc_vnf_chaining.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -14,9 +12,9 @@
    width="960.42157"
    height="482.07703"
    viewBox="0 0 960.42155 482.07702"
-   sodipodi:docname="uc_vnf_chaining_new.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   inkscape:export-filename="E:\Documents\ENEA Work files\ENFV work\ENA 2.2.2\Example Usecase pics\uc_vnf_chaining_new.png"
+   sodipodi:docname="uc_vnf_chaining.svg"
+   inkscape:version="1.0.2 (e86c870, 2021-01-15)"
+   inkscape:export-filename="D:\ENEA Work files\ENFV work\ENA 2.4\AP-636\uc_vnf_chaining.png"
    inkscape:export-xdpi="60.310001"
    inkscape:export-ydpi="60.310001">
   <metadata
@@ -174,13 +172,13 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="713"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
      id="namedview4"
      showgrid="false"
-     inkscape:zoom="0.81454783"
-     inkscape:cx="494.65223"
-     inkscape:cy="201.83139"
+     inkscape:zoom="1.1519446"
+     inkscape:cx="460.98794"
+     inkscape:cy="291.07773"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
@@ -192,7 +190,8 @@
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:showpageshadow="false"
-     showborder="false" />
+     showborder="false"
+     inkscape:document-rotation="0" />
   <g
      inkscape:groupmode="layer"
      id="layer2"
@@ -213,7 +212,7 @@
          id="g5968">
         <text
            xml:space="preserve"
-           style="font-style:normal;font-weight:normal;font-size:8.46666622px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+           style="font-style:normal;font-weight:normal;font-size:8.46667px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
            x="18.006182"
            y="21.814686"
            id="text5964"><tspan
@@ -221,7 +220,7 @@
              id="tspan5962"
              x="18.006182"
              y="21.814686"
-             style="font-size:8.46666622px;stroke-width:0.26458332">Cloud</tspan></text>
+             style="font-size:8.46667px;stroke-width:0.264583">Cloud</tspan></text>
       </g>
     </g>
     <rect
@@ -234,7 +233,7 @@
        rx="22.677166" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.99999809px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="876.67236"
        y="570.11469"
        id="text5981"><tspan
@@ -242,11 +241,11 @@
          id="tspan5979"
          x="876.67236"
          y="570.11469"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.99999809px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.99999994">uCPE</tspan><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:1">uCPE</tspan><tspan
          sodipodi:role="line"
          x="876.67236"
          y="610.11469"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.99999809px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:1"
          id="tspan5983">Device</tspan></text>
     <g
        transform="matrix(3.7795276,0,0,3.7795276,428.74031,418.42027)"
@@ -264,15 +263,15 @@
          id="text5996"
          y="62.470726"
          x="35.614925"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="stroke-width:0.26458332"
+           style="stroke-width:0.264583"
            y="62.470726"
            x="35.614925"
            id="tspan5994"
            sodipodi:role="line">uCPE</tspan><tspan
            id="tspan5998"
-           style="stroke-width:0.26458332"
+           style="stroke-width:0.264583"
            y="73.054062"
            x="35.614925"
            sodipodi:role="line">Manager</tspan></text>
@@ -293,9 +292,9 @@
          id="text6011"
          y="111.3953"
          x="104.96505"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="stroke-width:0.26458332"
+           style="stroke-width:0.264583"
            y="111.3953"
            x="104.96505"
            id="tspan6009"
@@ -317,9 +316,9 @@
          id="text6054"
          y="36.242371"
          x="174.40106"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:8.46666622px;stroke-width:0.26458332"
+           style="font-size:8.46667px;stroke-width:0.264583"
            y="36.242371"
            x="174.40106"
            id="tspan6052"
@@ -341,9 +340,9 @@
          id="text6066"
          y="68.725212"
          x="168.60965"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:8.46666622px;stroke-width:0.26458332"
+           style="font-size:8.46667px;stroke-width:0.264583"
            y="68.725212"
            x="168.60965"
            id="tspan6064"
@@ -366,9 +365,9 @@
          id="text892"
          y="-24.028263"
          x="158.336"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:8.46666622px;writing-mode:lr-tb;stroke-width:0.26458332"
+           style="font-size:8.46667px;writing-mode:lr-tb;stroke-width:0.264583"
            y="-24.028263"
            x="158.336"
            id="tspan890"
@@ -452,11 +451,7 @@
        style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
        x="1111.8201"
        y="185.74878"
-       id="text16006"><tspan
-         sodipodi:role="line"
-         id="tspan16004"
-         x="1111.8201"
-         y="221.1394" /></text>
+       id="text16006" />
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:1.19493914;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 875.06947,109.79183 -0.0401,88.56814"
@@ -490,7 +485,7 @@
        rx="7.8679585" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="765.37158"
        y="157.87267"
        id="text892-7-8-1-0"><tspan
@@ -498,7 +493,7 @@
          id="tspan890-2-1-5-6"
          x="765.37158"
          y="157.87267"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">sfc_br</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">sfc_br</tspan></text>
     <rect
        style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.93168956;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect5977-9-8-71-7"
@@ -537,7 +532,7 @@
            rx="13.834034" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
            x="841.7915"
            y="62.518135"
            id="text1458-5"><tspan
@@ -553,7 +548,7 @@
          x="870.17896"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="109.18118"
            x="870.17896"
            id="tspan7681"
@@ -564,7 +559,7 @@
          x="795.86865"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="109.18118"
            x="795.86865"
            id="tspan7685-0"
@@ -583,7 +578,7 @@
          id="text1454"
          y="405.72467"
          x="688.84973"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
            style="font-size:24px"
            y="405.72467"
@@ -601,7 +596,7 @@
          id="tspan263"
          x="839.50726"
          y="184.34474"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">dpdk</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">dpdk</tspan></text>
     <rect
        style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.4464258;stroke-opacity:1"
        id="rect6098-9-2-8"
@@ -613,7 +608,7 @@
        ry="9.7688789" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="874.43616"
        y="157.74759"
        id="text892-7-06-88"><tspan
@@ -621,7 +616,7 @@
          id="tspan890-2-0-9"
          x="874.43616"
          y="157.74759"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">lan_br</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">lan_br</tspan></text>
     <rect
        style="display:inline;fill:#a9d18e;fill-opacity:1;stroke:#000000;stroke-width:1.09172344;stroke-opacity:1"
        id="rect6062-3-1-8-6-6"
@@ -632,7 +627,7 @@
        rx="13.834034" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
        x="683.34515"
        y="63.026798"
        id="text1466-1"><tspan
@@ -651,7 +646,7 @@
          id="tspan7681-8"
          x="709.22375"
          y="109.318"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">lan</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">lan</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
@@ -662,7 +657,7 @@
          id="tspan7685-0-5"
          x="639.34747"
          y="109.318"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">wan</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">wan</tspan></text>
     <g
        id="g2145">
       <text
@@ -671,7 +666,7 @@
          x="619.76776"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="184.37215"
            x="619.76776"
            id="tspan263-9"
@@ -690,7 +685,7 @@
            ry="9.7688789" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="654.4104"
            y="150.88129"
            id="text892-7-8-9"><tspan
@@ -698,19 +693,19 @@
              id="tspan890-2-1-9"
              x="654.4104"
              y="150.88129"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">wan_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">wan_br</tspan></text>
       </g>
     </g>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="763.6579"
        y="-35.451283"
        id="text5981-3-7"><tspan
          sodipodi:role="line"
          x="763.6579"
          y="-35.451283"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1"
          id="tspan5983-4-5">uCPE Device 2</tspan></text>
   </g>
   <g
@@ -727,7 +722,7 @@
        inkscape:connector-curvature="0" />
     <flowRoot
        transform="translate(-199.73182,56.969024)"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
        id="flowRoot1440"
        xml:space="preserve"><flowRegion
          id="flowRegion1442"><rect
@@ -736,7 +731,8 @@
            height="137.12756"
            width="147.02336"
            id="rect1444" /></flowRegion><flowPara
-         id="flowPara1446" /></flowRoot>    <path
+         id="flowPara1446" /></flowRoot>
+    <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:1.19493914;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m -134.46807,208.19818 -0.0401,88.56814"
        id="path8471-3-2-5-5-29-4-8-2-9-4-1"
@@ -774,7 +770,7 @@
        rx="7.8679585" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="-24.426455"
        y="256.40601"
        id="text892-7-8-1-0-9"><tspan
@@ -782,7 +778,7 @@
          id="tspan890-2-1-5-6-2"
          x="-24.426455"
          y="256.40601"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">sfc_br</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">sfc_br</tspan></text>
     <rect
        style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.93168956;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect5977-9-8-71-7-1"
@@ -811,7 +807,7 @@
        rx="13.834034" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
        x="55.993469"
        y="161.05148"
        id="text1458-5-7"><tspan
@@ -830,7 +826,7 @@
          id="tspan7681-70"
          x="72.38092"
          y="207.71452"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">wan</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">wan</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
@@ -841,7 +837,7 @@
          id="tspan7685-0-1"
          x="18.070602"
          y="207.71452"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">lan</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">lan</tspan></text>
     <g
        id="g2807"
        transform="translate(-4)">
@@ -851,7 +847,7 @@
          x="53.709198"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="282.87811"
            x="53.709198"
            id="tspan263-0"
@@ -869,9 +865,9 @@
          id="text892-7-06-88-7"
          y="256.28094"
          x="88.638092"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1"
            y="256.28094"
            x="88.638092"
            id="tspan890-2-0-9-5"
@@ -887,7 +883,7 @@
        rx="14.465943" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
        x="-106.60316"
        y="161.1617"
        id="text1466-1-9"><tspan
@@ -908,7 +904,7 @@
          id="tspan7681-8-6"
          x="-82.574295"
          y="207.85135"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">wan</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">wan</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
@@ -919,7 +915,7 @@
          id="tspan7685-0-5-5"
          x="-142.45058"
          y="207.85135"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">lan</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">lan</tspan></text>
     <g
        transform="translate(-789.79805,98.53334)"
        style="display:inline"
@@ -930,7 +926,7 @@
          x="619.76776"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="184.37215"
            x="619.76776"
            id="tspan263-9-3"
@@ -949,7 +945,7 @@
            ry="9.7688789" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="654.4104"
            y="150.88129"
            id="text892-7-8-9-2"><tspan
@@ -957,19 +953,19 @@
              id="tspan890-2-1-9-7"
              x="654.4104"
              y="150.88129"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">lan_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">lan_br</tspan></text>
       </g>
     </g>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="-24.288576"
        y="63.082054"
        id="text5981-3-7-2"><tspan
          sodipodi:role="line"
          x="-24.288574"
          y="63.082054"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1"
          id="tspan5983-4-5-0">uCPE Device 1</tspan></text>
     <g
        transform="translate(-7.9999969)"
@@ -984,7 +980,7 @@
          id="text1450"
          y="404.73138"
          x="-133.32915"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
            style="font-size:24px"
            y="404.73138"
@@ -1014,7 +1010,7 @@
          style="display:inline">
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;filter:url(#filter4332)"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;filter:url(#filter4332)"
            x="-0.59244788"
            y="284.13779"
            id="text4338"
@@ -1022,34 +1018,31 @@
              sodipodi:role="line"
              x="-0.59244788"
              y="284.13779"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4344">Legend: </tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="320.57343"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4348">- Connection via cloud/internet:</tspan><tspan
              id="tspan1311"
              sodipodi:role="line"
              x="-0.59244788"
              y="359.39594"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.79837799px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.7984px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"><tspan
    id="tspan1379"
-   style="font-size:29.14851379px">- VPN/BTB:</tspan> </tspan><tspan
+   style="font-size:29.1485px">- VPN/BTB:</tspan> </tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="387.31546"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4651" /><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="410.6488"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4340" /><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="433.98215"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4342" /></text>
       </g>
       <g
@@ -1072,29 +1065,26 @@
      id="layer5"
      inkscape:label="btb, internet, ucpe manager"
      transform="translate(200.89436,-53.375023)"
-     style="display:inline">
+     style="display:inline"
+     sodipodi:insensitive="true">
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
        x="20.80323"
        y="698.74994"
-       id="text756"><tspan
-         sodipodi:role="line"
-         id="tspan754"
-         x="20.80323"
-         y="717.966" /></text>
+       id="text756" />
     <g
        id="g1813">
       <path
          inkscape:connector-curvature="0"
          id="path8471-3-2-5-5-4-6"
          d="m 472.95984,308.61809 -0.0696,28.15396"
-         style="display:inline;fill:none;stroke:#e90000;stroke-width:0.88743383;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;fill:none;stroke:#e90000;stroke-width:0.887434;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
          inkscape:connector-curvature="0"
          id="path8471-3-2-5-5-4"
          d="m 90.357212,308.60091 -0.06963,28.15396"
-         style="display:inline;fill:none;stroke:#e90000;stroke-width:0.88743383;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;fill:none;stroke:#e90000;stroke-width:0.887434;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
          inkscape:connector-curvature="0"
          id="path8471-3-2-5-5-4-6-9"
@@ -1102,22 +1092,22 @@
          style="display:inline;fill:#fa5555;fill-opacity:1;stroke:#f30000;stroke-width:0.917;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23513758;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.47027507, 1.23513754, 0.61756876, 1.23513754;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23514;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.47028, 1.23514, 0.617569, 1.23514;stroke-dashoffset:0;stroke-opacity:1"
        d="m 280.32599,373.33137 v 71.44886"
        id="path8471-3-0-5-4-7-6-3-7-2"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23513758;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.47027507, 1.23513754, 0.61756876, 1.23513754;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23514;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.47028, 1.23514, 0.617569, 1.23514;stroke-dashoffset:0;stroke-opacity:1"
        d="m 324.94411,252.1566 v 71.44886"
        id="path8471-3-0-5-4-7-6-3-7"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23818851;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.4763771, 1.23818854, 0.61909428, 1.23818854;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23819;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.47638, 1.23819, 0.619094, 1.23819;stroke-dashoffset:0;stroke-opacity:1"
        d="M 324.94411,252.15659 H 396.7464"
        id="path8471-3-0-3-8"
        inkscape:connector-curvature="0" />
     <rect
-       style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.93168956;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.93169;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect5977-9-8-71-3"
        width="11.258382"
        height="23.27355"
@@ -1131,12 +1121,12 @@
          inkscape:connector-curvature="0"
          id="path8471-3-0-5-4-7-6-3-7-20"
          d="m 230.73334,252.1566 v 71.44886"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:1.23513758;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.47027507, 1.23513754, 0.61756876, 1.23513754;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;fill:none;stroke:#000000;stroke-width:1.23514;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.47028, 1.23514, 0.617569, 1.23514;stroke-dashoffset:0;stroke-opacity:1" />
       <path
          inkscape:connector-curvature="0"
          id="path8471-3-0-3-8-4"
          d="M 230.73334,252.15659 H 158.93105"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:1.23818851;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.4763771, 1.23818854, 0.61909428, 1.23818854;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;fill:none;stroke:#000000;stroke-width:1.23819;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.47638, 1.23819, 0.619094, 1.23819;stroke-dashoffset:0;stroke-opacity:1" />
       <rect
          transform="scale(-1,1)"
          rx="1.2365078"
@@ -1145,7 +1135,7 @@
          height="23.27355"
          width="11.258382"
          id="rect5977-9-8-71-3-0"
-         style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.93168956;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.93169;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
     <g
        id="g2541">
@@ -1153,33 +1143,33 @@
          inkscape:connector-curvature="0"
          id="path5091-2-9"
          d="m 285.79578,282.35384 a 38.855204,52.805708 0 0 0 -25.4146,12.9496 27.874385,29.472953 0 0 0 -5.83847,-0.66915 27.874385,29.472953 0 0 0 -23.90343,14.37905 38.701484,43.266581 0 0 0 -3.81757,-0.21342 38.701484,43.266581 0 0 0 -38.70176,43.26683 38.701484,43.266581 0 0 0 10.45454,29.52569 19.427603,20.876675 0 0 0 -0.62526,5.14477 19.427603,20.876675 0 0 0 19.42759,20.87671 19.427603,20.876675 0 0 0 6.81189,-1.33599 17.738246,34.385112 0 0 0 11.77104,8.70425 17.738246,34.385112 0 0 0 10.05859,-6.10906 32.097777,36.841192 0 0 0 22.88385,11.02119 32.097777,36.841192 0 0 0 24.82399,-13.52037 47.301991,30.700992 0 0 0 22.47804,3.69605 47.301991,30.700992 0 0 0 47.30198,-30.70098 47.301991,30.700992 0 0 0 -2.81288,-10.33994 36.611017,34.385112 0 0 0 11.83871,-25.27322 36.611017,34.385112 0 0 0 -36.60986,-34.3851 36.611017,34.385112 0 0 0 -15.08215,3.09888 38.855204,52.805708 0 0 0 -35.04424,-30.11573 z"
-         style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.96103942;stroke-opacity:1" />
+         style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.961039;stroke-opacity:1" />
       <text
          id="text4180-9-8-7"
          y="359.57266"
          x="238.57793"
-         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="359.57266"
            x="238.57793"
            id="tspan4178-6-6-2"
            sodipodi:role="line">Internet</tspan></text>
     </g>
     <g
-       id="g1119">
+       id="g219">
       <rect
-         rx="16.219593"
+         rx="19.900242"
          y="445.04919"
-         x="205.9808"
+         x="189.10994"
          height="89.990753"
-         width="148.69037"
+         width="182.4321"
          id="rect5992-9-0"
-         style="fill:#ff9955;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.82419372;stroke-opacity:1"
+         style="fill:#ff9955;fill-opacity:0.641414;stroke:#000000;stroke-width:0.912932;stroke-opacity:1"
          ry="16.015759" />
       <flowRoot
-         transform="matrix(0.89433392,0,0,0.88309463,-246.06529,120.6069)"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+         transform="matrix(1.4158503,0,0,1.398057,-552.21284,-79.033294)"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.0039px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
          id="flowRoot2130"
          xml:space="preserve"><flowRegion
            id="flowRegion2132"><rect
@@ -1187,10 +1177,10 @@
              x="528.01184"
              height="68.571358"
              width="118.79844"
-             id="rect2134" /></flowRegion><flowPara
-           id="flowPara2136"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.00584412px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle">uCPE</flowPara><flowPara
+             id="rect2134"
+             style="stroke-width:1;" /></flowRegion><flowPara
            id="flowPara2138"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.00584412px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle">Manager</flowPara></flowRoot>    </g>
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.0039px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle">Enea Edge Management</flowPara></flowRoot>
+    </g>
   </g>
 </svg>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/introduction.xml b/doc/book-enea-edge-example-usecases/doc/introduction.xml
index fc3559b..27824da 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/introduction.xml
+++ b/doc/book-enea-edge-example-usecases/doc/introduction.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="intro">
   <title>Introduction</title>
 
@@ -6,19 +6,19 @@
   configuration, onboarding and instantiation of certain VNFs, VNF chaining,
   etc.</para>
 
-  <para>Before running any example use case make sure the uCPE device(s) have
-  been added to the uCPE Manager and placed on the map. For detailed
-  information on how to add a device to the uCPE Manager, how to configure the
-  network interfaces to use DPDK, PCI-passthrough or SR-IOV drivers, or VNF
-  configuration, please refer to the <xi:include
-  href="../../s_docbuild/olinkdb/pardoc-common.xml"
+  <para>Before running any example use-case make sure the uCPE device(s) have
+  been added to the Enea Edge Management application and placed on the map.
+  For detailed information on how to add a device to the Enea Edge Management
+  application, how to configure the network interfaces to use DPDK,
+  PCI-passthrough or SR-IOV drivers, or VNF configuration, please refer to the
+  <xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xpointer="element(book_enea_nfv_access_getting_started/1)" /> Manual.</para>
+  xpointer="element(book_enea_edge_getting_started/1)" /> Manual.</para>
 
   <note>
     <para>Examples presented in this document use 3rd-party VNFs, which are
     not provided by Enea. To procure and use these VNF image files and license
-    files, please contact the VNF provider. </para>
+    files, please contact the VNF provider.</para>
 
     <para>Request the VNF prerequisites from the VNF vendors, or alternatively
     obtain the prerequisites based on instructions from each VNF vendor
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/service_chaining_128t_fortigate.xml b/doc/book-enea-edge-example-usecases/doc/service_chaining_128t_fortigate.xml
index 1f3a6ce..4529fbf 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/service_chaining_128t_fortigate.xml
+++ b/doc/book-enea-edge-example-usecases/doc/service_chaining_128t_fortigate.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="service_chaining_128t_fortigate">
   <title>Service Chaining 128T - Fortigate Example Use-case</title>
 
   <para>The following is an example of how to setup and configure a service
-  chain on top of the Enea NFV Access virtualization platform, using the
-  following commercial VNFs: 128T router and FortiGate.</para>
+  chain on top of the Enea Edge Runtime, using the following commercial VNFs:
+  128T router and FortiGate.</para>
 
   <section id="prereq_serv_chain_cust">
     <title>Prerequisites</title>
@@ -86,9 +86,9 @@
       <para><emphasis role="bold">Configuring Network Interfaces on uCPE
       devices:</emphasis><orderedlist>
           <listitem>
-            <para>Add the trgt uCPE device into the uCPE Manager:
-            <literal>Devices -&gt; Manage -&gt; Add</literal>, and fill in the
-            required fields with the following data:</para>
+            <para>Add the trgt uCPE device into the Enea Edge Management
+            application: <literal>Devices -&gt; Manage -&gt; Add</literal>,
+            and fill in the required fields with the following data:</para>
 
             <table>
               <title>Device Details</title>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/vnf_chaining.xml b/doc/book-enea-edge-example-usecases/doc/vnf_chaining.xml
index 8b82337..affbf39 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/vnf_chaining.xml
+++ b/doc/book-enea-edge-example-usecases/doc/vnf_chaining.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="vnf_chaining">
   <title>VNF Chaining Example Use-case</title>
 
@@ -11,9 +11,8 @@
 
   <para>The following is an example of how to setup and configure a
   branch-to-branch service comprised on two commercial VNFs (SD-WAN +
-  Firewall). This service will run in a service chain on top of the Enea NFV
-  Access virtualization platform, deployed through the Enea uCPE
-  Manager.</para>
+  Firewall). This service will run in a service chain on top of the Enea Edge
+  Runtime, deployed through the Enea Edge Management.</para>
 
   <para>In the example setup the following commercial VNFs are used: Juniper
   vSRX as the SD-WAN VNF and Fortigate as the Router/Firewall.</para>
@@ -61,7 +60,7 @@
         </listitem>
 
         <listitem>
-          <para>VNF Configuration files, provided with your Enea NFV Access
+          <para>VNF Configuration files, provided with your Enea Edge
           Release:</para>
 
           <itemizedlist spacing="compact">
@@ -152,7 +151,7 @@
             <para>The networking setup (Steps 1-3) can be modeled using the
             Offline Configuration entry, so that it is automatically
             provisioned on the uCPE device, once it gets enrolled into the
-            management system (uCPE Manager).</para>
+            management system (Enea Edge Management).</para>
           </note>
         </listitem>
       </orderedlist>
diff --git a/doc/book-enea-nfv-access-getting-started/swcomp.mk b/doc/book-enea-edge-example-usecases/swcomp.mk
index ca6439f..83f672c 100755
--- a/doc/book-enea-nfv-access-getting-started/swcomp.mk
+++ b/doc/book-enea-edge-example-usecases/swcomp.mk
@@ -5,6 +5,6 @@ BOOK_VER ?= $(REL_VER)-dev
 
 DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
 
-BOOKPACKAGES := book-enea-nfv-access-getting-started
-BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access $(PROD_VER) Getting Started"
+BOOKPACKAGES := book-enea-edge-example-usecases
+BOOKDESC_$(BOOKPACKAGES) := "Enea Edge $(PROD_VER) Example Use-cases"
 BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-edge-getting-started/doc/advanced_configurations.xml b/doc/book-enea-edge-getting-started/doc/advanced_configurations.xml
new file mode 100644
index 0000000..c596735
--- /dev/null
+++ b/doc/book-enea-edge-getting-started/doc/advanced_configurations.xml
@@ -0,0 +1,1166 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<chapter id="advanced_conf">
+  <title>Advanced Configurations</title>
+
+  <para>This chapter describes possible configurations for advanced features
+  such as the Hugepage Reservation Service customization, UEFI Secure Boot and
+  Bare Metal Provisioning.</para>
+
+  <section id="bare_meta_prov">
+    <title>Bare Metal Provisioning</title>
+
+    <para>Bare Metal Provisioning can be used for automated deployment of the
+    Enea Edge Runtime on a large number of uCPE devices. The uCPE devices may
+    have no previous operating system installed, or are reinstalled without
+    preserving any existing data. Enea Edge Bare Metal Provisioning is based
+    on standardized Pre-Boot Execution environment (PXE) booting.</para>
+
+    <para>The Bare Metal Provisioning process begins by PXE booting an Enea
+    Edge installer <literal>initramfs</literal> image. The installer downloads
+    a configuration file, as well as the Enea Edge Runtime image and then
+    proceeds to install the system by dividing the disk into 2 partitions: a
+    GPT partition containing the GRUB boot loader and a second partition
+    containing the Enea Edge Runtime root filesystem. When the installation is
+    complete, the uCPE device is automatically rebooted into the Enea Edge
+    Runtime.</para>
+
+    <note>
+      <para>The <literal>.hddimg</literal>, <literal>initramfs</literal>, and
+      <literal>bzImage</literal> files are available in the
+      <filename>Enea_Edge_Runtime_&lt;processor&gt;_&lt;version&gt;-&lt;build_number&gt;.tar.gz</filename>
+      file downloaded with your release.</para>
+    </note>
+
+    <section id="bare_meta_prov_prereq">
+      <title>Prerequisites</title>
+
+      <itemizedlist>
+        <listitem>
+          <para>The uCPE devices to be installed are connected in a working
+          PXE network boot environment. The PXE server can be set up using any
+          Linux distribution that includes TFTP and DHCP software packages.
+          Refer to the documentation for your distribution for setup
+          instructions.</para>
+        </listitem>
+
+        <listitem>
+          <para>An HTTP server must be available and accessible from the uCPE
+          devices in the provisioning network. Note that the installer will
+          use the same interface that the uCPE device is PXE-booted from, to
+          obtain an IP address using DHCP and access the HTTP server.</para>
+        </listitem>
+
+        <listitem>
+          <para>The uCPE devices are preconfigured in BIOS to boot from the
+          hard drive where the Enea Edge Runtime will be installed.</para>
+        </listitem>
+
+        <listitem>
+          <para>CSM support and Dual Boot must be enabled in BIOS (i.e. PXE
+          booting in legacy mode), while the final Enea Edge Runtime image
+          will boot in UEFI mode. Doing a mass deployment using legacy PXE
+          booting usually means that Secure Boot is disabled, Secure Boot will
+          need to be enabled afterwards.</para>
+        </listitem>
+
+        <listitem>
+          <para>A remote management tool such as <literal>ipmitool</literal>
+          (or a vendor-specific tool) is available for use to set the next
+          boot option to PXE and reboot the uCPE devices in order to begin the
+          installation.</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+
+    <section id="bare_meta_prov_server">
+      <title>Server Configuration</title>
+
+      <para>The following images provided with your Enea Edge release need to
+      be made available on the PXE and HTTP servers:</para>
+
+      <orderedlist>
+        <listitem>
+          <para>Copy the Enea Edge installer <literal>initramfs</literal>
+          image and kernel <literal>bzImage</literal> for your uCPE device
+          architecture to the TFTP directory on the PXE server (e.g
+          <literal>/var/lib/tftpboot</literal>).</para>
+        </listitem>
+
+        <listitem>
+          <para>Compress the Enea Edge Runtime <literal>.hddimg</literal>
+          image for the uCPE device architecture using <literal>gzip</literal>
+          and copy the resulting <literal>hddimg.gz</literal> file to the HTTP
+          server.</para>
+        </listitem>
+      </orderedlist>
+
+      <section id="bare_meta_prov_install_config">
+        <title>Installation Configuration File</title>
+
+        <para>An installation configuration file needs to be prepared on the
+        HTTP server. The format of the configuration file is a list of
+        "<literal>name = value</literal>" pairs and the available parameters
+        are described below:</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><literal>image_url</literal> (mandatory). The HTTP server
+            URL used for downloading the Enea Edge Runtime image.</para>
+          </listitem>
+
+          <listitem>
+            <para><literal>install_drive</literal> (optional). The name of the
+            drive where the Enea Edge Runtime will be installed (e.g
+            <literal>/dev/sda</literal>). If not set, the installer will use
+            the largest detected (non-USB) drive on the uCPE device.</para>
+          </listitem>
+
+          <listitem>
+            <para><literal>prompt_user</literal> (optional). If the parameter
+            is set to "yes", the installer will ask for confirmation before
+            formatting and partitioning the drive. The default behaviour is to
+            proceed automatically without any user interaction.</para>
+          </listitem>
+        </itemizedlist>
+
+        <para>Installation Configuration File Example:</para>
+
+        <programlisting>image_url = http://192.168.1.100/enea-nfv-access-xeon-d.hddimg.gz
+install_drive = /dev/sda</programlisting>
+
+        <note>
+          <para>The installation configuration file needs to use the Linux
+          end-of-line format (\n), not the Windows format (\r\n).</para>
+        </note>
+      </section>
+
+      <section id="bare_meta_prov_pxe">
+        <title>PXE Configuration</title>
+
+        <para>A PXE entry for the Enea Edge installation needs to be added as
+        the default boot selection in the pxelinux configuration file (e.g
+        <literal>/var/lib/tftpboot/pxelinux.cfg/default</literal>). The PXE
+        entry should have the following settings:</para>
+
+        <programlisting>default nfv_access
+label nfv_access
+menu label ^NFV_ACCESS_INSTALLER
+kernel &lt;Path to kernel&gt;
+append root=/dev/ram0 initrd=&lt;Path to initramfs&gt; LABEL=pxe-installer \
+   INSTALL_CFG=http://&lt;Server IP&gt;/&lt;Path to install config file&gt; \
+   console=ttyS0,115200 earlyprintk=ttyS0,115200
+ipappend 2</programlisting>
+      </section>
+    </section>
+
+    <section id="bare_meta_prov_inst">
+      <title>Starting the Installation</title>
+
+      <para>To initiate the installation, set the boot device (for next boot
+      only) to PXE and reboot the uCPE devices. How to do this depends on the
+      remote management capabilities of the uCPE devices and may require
+      vendor-specific tools.</para>
+
+      <para>Example initiation using <literal>ipmitool</literal>:</para>
+
+      <programlisting>ipmitool -U &lt;user&gt; -P &lt;password&gt; -H &lt;uCPE device IPMI IP address&gt; chassis bootdev pxe
+ipmitool -U &lt;user&gt; -P &lt;password&gt; -H &lt;uCPE device IPMI IP address&gt; power reset   </programlisting>
+
+      <para>The uCPE devices should be configured in BIOS to boot from the
+      installation drive first in order to automatically start Enea Edge
+      Runtime when the installation is finished.</para>
+    </section>
+  </section>
+
+  <section id="uefi_secure_boot">
+    <title>UEFI Secure Boot</title>
+
+    <para>Secure Boot was designed to enhance security in the pre-boot
+    environment. It prevents malicious software and applications from being
+    loaded during the system start-up process.</para>
+
+    <para>The basic principle of UEFI Secure Boot is that it requires all
+    artifacts involved in the boot process (bootloaders, kernel, initramfs) to
+    be signed using a set of private keys. On a Secure Boot enabled uCPE
+    device these artifacts are checked against a set of public certificates
+    which correspond to these keys. If there are any mismatches the boot
+    process will fail at the stage(s) they are detected.</para>
+
+    <para>For more information about Secure Boot please refer to <ulink
+    url="https://www.uefi.org/sites/default/files/resources/UEFI_Secure_Boot_in_Modern_Computer_Security_Solutions_2013.pdf">Secure
+    Boot in Modern Computer Security Solutions</ulink>.</para>
+
+    <section id="secure_boot_keys">
+      <title>Enabling UEFI Secure Boot</title>
+
+      <para>All Enea Edge image artifacts delivered with the release are
+      signed using the Enea UEFI Secure boot private keys. These artifacts can
+      be used on a uCPE device that doesn't have Secure Boot enabled. To use
+      the Secure Boot feature, however, the user must make the Enea UEFI
+      Secure Boot public certificates available on the uCPE device before
+      enabling the feature in BIOS. This process is called
+      "Provisioning".</para>
+
+      <section id="manual_key_provisioning">
+        <title>Provisioning the Enea UEFI Secure Boot Certificates</title>
+
+        <para>The UEFI firmware is normally shipped with factory preloaded
+        certificates. If these do not already include Certificates from Enea,
+        they will need to be appended or replaced with the Enea
+        Certificates.</para>
+
+        <para><emphasis role="bold">UEFI Secure Boot certificates provided
+        with your release:</emphasis></para>
+
+        <itemizedlist>
+          <listitem>
+            <para><literal>Platform Key (PK)</literal>: this key protects the
+            next key from uncontrolled modification. Once this key is
+            enrolled, Secure Boot enters into <literal>User Mode</literal>.
+            The drivers and loaders signed with the <literal>Platform
+            Key</literal> can then be loaded by the firmware.</para>
+          </listitem>
+
+          <listitem>
+            <para><literal>Key Exchange key (KEK)</literal>: this key allows
+            other certificates which have a connection to the private portion
+            of the <literal>Platform Key</literal> to be used.</para>
+          </listitem>
+
+          <listitem>
+            <para><literal>Authorized Signature (DB)</literal>: contains the
+            <literal>trusted keys</literal> used for authenticating any
+            drivers or applications executed in the UEFI environment.</para>
+          </listitem>
+        </itemizedlist>
+
+        <para>The Enea UEFI Secure Boot certificates are installed together
+        with the Enea Edge Runtime onto the hard drive. They can be found on
+        the EFI partition (usually the first partition of the drive) under
+        <literal>/uefi_sb_keys</literal>.</para>
+
+        <para>These certificates need to be manually enrolled in BIOS. The
+        exact details on how to proceed may vary depending the version of the
+        UEFI firmware.</para>
+
+        <para>The UEFI firmware is normally shipped with factory preloaded
+        certificates. If these do not already include Certificates from Enea,
+        they will need to be appended or replaced with the Enea
+        Certificates.</para>
+      </section>
+
+      <section id="enable_secure_boot">
+        <title>Enabling Secure Boot in BIOS</title>
+
+        <para>Once the certificates are enrolled, Secure Boot needs to be
+        enabled in BIOS and the device rebooted.</para>
+      </section>
+    </section>
+  </section>
+
+  <section id="hugepage_reservation">
+    <title>Hugepage Reservation Service</title>
+
+    <para>Huge page memory support is a mechanism that allows the Linux kernel
+    to support larger page sizes than the default page unit (4KB). Huge pages
+    are contiguous blocks of memory that come in 2MB or 1GB sizes. By using
+    huge page allocations, less memory is used for page tables and the
+    Translation Lookaside Buffer (TLB) miss rate is significantly reduced.
+    Enea Edge Runtime uses huge page backed memory in KVM guests in order to
+    improve performance.</para>
+
+    <para>Enea Edge Runtime implements an automatic hugepage allocation
+    service that is triggered at each startup. The service is skipped if
+    hugepages have been allocated in the kernel boot command line.</para>
+
+    <para>There are two strategies outlined for hugepage allocation:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>If a system has an amount of memory up to 8GB, the allocation
+        algorithm will reserve up to 30% (no more than 2GB), for the OS and
+        the rest as 2MB hugepages.</para>
+      </listitem>
+
+      <listitem>
+        <para>If a system has an amount of memory that's higher than 8GB, the
+        allocation algorithm will reserve all but 2GB of memory as 1GB
+        hugepages, leaving the rest (2GB) to be used by the OS.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>This is a best effort reservation after kernel boot, so the
+      results may vary accordingly.</para>
+    </note>
+
+    <section id="hugepage_customizing_auto">
+      <title>Customizing Automatic Hugepage Reservation</title>
+
+      <para>Configuration of Hugepage reservation is done in
+      <literal>/etc/enea-nfv-access/hugepages.cfg</literal>.</para>
+
+      <para><emphasis role="bold">Parameters used by the automatic algorithm:
+      </emphasis></para>
+
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para><literal>hugepage_setup</literal>: Enables the automatic
+          configuration algorithm. It has only one value,
+          <literal>auto</literal>. For manual configuration comment or remove
+          this parameter. Use the other parameter descriptions as a
+          template/example.</para>
+        </listitem>
+
+        <listitem>
+          <para><literal>threshold_to_use_1g</literal>: Decides the threshold
+          which instructs the algorithm to use 1GB hugepages. If a system's
+          memory is higher than <literal>threshold_to_use_1g</literal>, then
+          the algorithm will use 1GB hugepages, otherwise it will use 2MB
+          hugepages.</para>
+        </listitem>
+
+        <listitem>
+          <para><literal>percent_os_alloc</literal>: Decides how much memory
+          to try to reserve for userspace applications. The algorithm will try
+          to reserve at least the value of <literal>percent_os_alloc</literal>
+          of the total system memory for userspace applications.</para>
+        </listitem>
+
+        <listitem>
+          <para><literal>maximum_os_alloc_mb</literal>: Maximum amount of
+          memory to allocate for userspace applications. If
+          <literal>percent_os_alloc</literal> of the total system memory
+          exceeds <literal>maximum_os_alloc_mb</literal> then the maximum
+          allocated memory for userspace applications is
+          <literal>maximum_os_alloc_mb</literal>.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para><emphasis role="bold">Example of automatic Hugepage
+      Configuration:</emphasis></para>
+
+      <programlisting>hugepage_setup = auto
+threshold_to_use_1g = 8192
+percent_os_alloc = 30
+maximum_os_alloc_mb = 2048</programlisting>
+
+      <para>The following possible allocations can result (based on total
+      system memory available):</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>2GB of memory: approximately 30% will be allocated for the OS
+          and the rest will be allocated as 2MB hugepages.</para>
+        </listitem>
+
+        <listitem>
+          <para>4GB of memory: approximately 30% will be allocated for the OS
+          and the rest will be allocated as 2MB hugepages.</para>
+        </listitem>
+
+        <listitem>
+          <para>16GB of memory: approximately 2GB will be allocated for the OS
+          and the rest as 1GB hugepages.</para>
+        </listitem>
+      </itemizedlist>
+
+      <note>
+        <para>The memory allocated for the kernel and hugepages might vary
+        slightly depending on how much memory is available.</para>
+      </note>
+    </section>
+
+    <section id="hugepage_customizing_man">
+      <title>Customizing Manual Hugepage Reservation</title>
+
+      <para>The automatic algorithm can be disabled and hugepages in turn,
+      configured manually. To do this, comment the line which defines
+      <literal>hugepage_setup</literal> as <literal>auto</literal> and
+      configure memory for each CPU socket in the following manner:</para>
+
+      <programlisting>&lt;NUMA node&gt;.&lt;hugepage size&gt; = &lt;number of pages&gt;</programlisting>
+
+      <para>Where <literal>&lt;NUMA node&gt;</literal> refers to a node which
+      is part of the system's NUMA topology, <literal>&lt;hugepage
+      size&gt;</literal> decides what type of hugepages should be set and
+      <literal>&lt;number of hugepages&gt;</literal> is how many hugepages of
+      <literal>&lt;hugepage size&gt;</literal> should be allocated.</para>
+
+      <para>To list the available system nodes, run:</para>
+
+      <programlisting>ls -d /sys/devices/system/node/node* </programlisting>
+
+      <para>To list available hugepage sizes, per node, run:</para>
+
+      <programlisting>ls -d /sys/devices/system/node/node*/hugepages/hugepages-*</programlisting>
+
+      <para>Example of Manual Hugepage Configuration, configuring the system
+      to allocate three 1GB hugepages and 512 of 2MB hugepages on node:</para>
+
+      <programlisting>node0.2048kB = 512
+node0.1048576kB = 3 </programlisting>
+
+      <note>
+        <para>Make sure there are no hugepages reserved in the kernel boot
+        command line, these will override any manual configuration done in the
+        service.</para>
+      </note>
+    </section>
+  </section>
+
+  <section id="create_certificate">
+    <title>Tomcat Certificate Generation</title>
+
+    <para>The self-signed Tomcat Certificate the Enea Edge
+    Management application uses is generated at installation time. It can
+    be regenerated anytime after installation by using the
+    <filename>createCertificate.sh</filename> script.</para>
+
+    <para>On the CentOS 7 server open a terminal, log into a bash shell with
+    the root account and perform the following:</para>
+
+    <orderedlist>
+        <listitem>
+          <para>Extract <literal>Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</literal></para>
+
+          <para>The directory in which the archive has been unpacked will be
+          denoted as: <literal>&lt;uCPEM-installerdir&gt;</literal>.</para>
+        </listitem>
+
+        <listitem>
+          <para>Enter <literal>&lt;uCPEM-installerdir&gt;/dist</literal>.</para>
+        </listitem>
+
+        <listitem>
+          <para>Run the following command:</para>
+
+          <programlisting>./createCertificate.sh ucpemanager &lt;IP_or_domain&gt; \
+            /opt/ems [&lt;service_username&gt;]</programlisting>
+
+          <para>Where the following need to be included:</para>
+
+          <itemizedlist>
+            <listitem>
+              <para>The IP or domain name of the server the Enea Edge
+              Management application is running on.</para>
+            </listitem>
+
+            <listitem>
+              <para>The service username, which is the one set when installing the
+              Enea Edge Management application. For more details
+                see <olink targetdoc="book_enea_edge_getting_started"
+              targetptr="fresh_ucpemg_install">Fresh Installation of the Enea
+              Edge Management application in the <ns:include
+              href="../../s_docbuild/olinkdb/pardoc-names.xml"
+              xmlns:ns="http://www.w3.org/2001/XInclude"
+              xpointer="element(book_enea_edge_getting_started/1)" /></olink> Manual.
+              Providing the service username is optional. If it is not provided, the default
+              value will be used.</para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+
+        <listitem>
+          <para>Restart the Enea Edge Management service:</para>
+
+          <programlisting>service ucpemanager restart</programlisting>
+        </listitem>
+      </orderedlist>
+  </section>
+
+  <section condition="hidden" id="high_availability_ig">
+    <title>Installing the Enea Edge Management application in High
+    Availability Mode</title>
+
+    <para>The following describes the setup needed for running the Enea Edge
+    Management application in High Availabilty (HA) mode, with a MariaDB
+    database cluster. A setup example is illustrated in the diagram
+    below.</para>
+
+    <figure>
+      <title>The High Availability setup</title>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" contentwidth="600"
+                     fileref="images/high_av_setup.png" />
+        </imageobject>
+      </mediaobject>
+    </figure>
+
+    <para>The setup consists of two sub-clusters, placed in different
+    geographical locations, each consisting of three MariaDB servers. In this
+    example, two of the machines are running only MariaDB, while the rest are
+    hosting a MariaDB server and an Enea Edge Management instance. The entire
+    network is hidden behind a firewall that performs NAT. While in protection
+    (cluster) mode, the Enea Edge Management application instances promote a
+    single Virtual IP (VIP). The cluster can be reached either from the
+    primary server IP or via VIP (recommended), since the VIP interface is
+    spawned on the primary server. In case of a primary failure, a newly
+    elected primary (from one of the backups) will respawn the VIP interface.
+    The firewall in this scenario will allocate a public IP for the outside
+    world that will be translated into the VIP. Also in this example, the
+    traffic towards the cluster from outside the firewall is done through
+    HTTPS, which will be translated to HTTP inside the private network.</para>
+
+    <note>
+      <para>By default, communication to the Enea Edge Management application
+      is done with HTTPS. To enable HTTP, go to <emphasis
+      role="bold">System</emphasis>, <emphasis
+      role="bold">Configuration</emphasis>, click on the <emphasis
+      role="bold">Web Access</emphasis> tab and check the <emphasis
+      role="bold">Enable HTTP</emphasis> checkbox.</para>
+    </note>
+
+    <para><emphasis role="bold">High-Availability - Design
+    Limitations</emphasis></para>
+
+    <para>Enea's solution for Edge Management High-Availability is designed to
+    maximize resiliency of the management function. However, the current design 
+      does not provide guaranteed consistency across all Enea Edge
+    Management instances, i.e. some information might become out-of-sync in
+    certain conditions.</para>
+
+    <para>In order to reach full consistency, design would rely on
+    transactional data updates across the Primary instance and all Backups,
+    but the latency would significantly increase for all management
+    operations, which is considered to be a severe limitation.</para>
+
+    <para>In the current version of the Enea Edge Management application when
+    in High Availability mode, there are two kinds of data that needs to be
+    synchronized: data in the database and data residing in the Primary
+    instance filesystem. This means that there are intervals when data is
+    being synchronized from the Primary instance to the Backup(s) and Primary
+    failure at this time will result in incomplete/inconsistent data on the
+    Backup(s). For example, a VNF which has been onboarded on the Primary
+    instance will not be visible in a Backup instance(s) until both database
+    and filesystem have been synchronized. If a Backup instance becomes the
+    active one before synchronization takes place, this would result in an
+    out-of-sync state.</para>
+    
+    <section id="ha_reqs">
+      <title>Requirements for High Availability</title>
+
+      <para>The following hardware is needed for deploying the base
+      configuration:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>Machines running the Enea Edge Management application and
+          MariaDB:</para>
+
+          <itemizedlist spacing="compact">
+            <listitem>
+              <para>4 CPU cores</para>
+            </listitem>
+
+            <listitem>
+              <para>12 - 16 GB memory</para>
+            </listitem>
+
+            <listitem>
+              <para>256 - 512 GB hard disk</para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+
+        <listitem>
+          <para>Machines running only MariaDB:</para>
+
+          <itemizedlist spacing="compact">
+            <listitem>
+              <para>2 CPU cores</para>
+            </listitem>
+
+            <listitem>
+              <para>8 GB memory</para>
+            </listitem>
+
+            <listitem>
+              <para>256 - 512 GB hard disk</para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+      </itemizedlist>
+    </section>
+
+    <section id="firewall_rules">
+      <title>Firewall Rules</title>
+
+      <para>Please refer to <olink targetdoc="book_enea_edge_getting_started"
+      targetptr="firewall_config">Firewall Configuration in the <xi:include
+      href="../../s_docbuild/olinkdb/pardoc-names.xml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xpointer="element(book_enea_edge_getting_started/1)" /></olink> Manual.
+      In addition, the following configuration is needed:</para>
+
+      <orderedlist>
+        <listitem>
+          <para>Disable <literal>SELINUX</literal> on all database servers by
+          editing <literal>/etc/sysconfig/selinux</literal> and changing the
+          following:</para>
+
+          <programlisting>SELINUX=disabled
+SELINUXTYPE=targeted</programlisting>
+        </listitem>
+
+        <listitem>
+          <para>Reboot the server:</para>
+
+          <programlisting>[root@localhost ~]# sudo shutdown -r now</programlisting>
+        </listitem>
+      </orderedlist>
+
+      <para>The following ports should be opened in the local firewall (not
+      the one doing NAT), for each Enea Edge Management machine:</para>
+
+      <table>
+        <title>Ports for Enea Edge Management Machines</title>
+
+        <tgroup cols="2">
+          <colspec align="left" />
+
+          <thead>
+            <row>
+              <entry align="center">Port (Protocol)</entry>
+
+              <entry align="center">Usage</entry>
+            </row>
+          </thead>
+
+          <tbody>
+            <row>
+              <entry>80 (TCP)</entry>
+
+              <entry>HTTP</entry>
+            </row>
+
+            <row>
+              <entry>443 (TCP)</entry>
+
+              <entry>HTTPS</entry>
+            </row>
+
+            <row>
+              <entry>54327 (UDP)</entry>
+
+              <entry>Cluster multicasting (Hazelcast)</entry>
+            </row>
+
+            <row>
+              <entry>5701 - 5708 (TCP)</entry>
+
+              <entry>Hazelcast communications</entry>
+            </row>
+
+            <row>
+              <entry>4334 (TCP)</entry>
+
+              <entry>NETCONF call-home</entry>
+            </row>
+
+            <row>
+              <entry>7000 - 7009 (TCP)</entry>
+
+              <entry>Reverse SSH connection pool</entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+
+      <para>For MariaDB, the following ports must be opened (on each MariaDB
+      server, including the ones hosting the Enea Edge Management
+      application):</para>
+
+      <table>
+        <title>Ports for MariaDB Machines</title>
+
+        <tgroup cols="2">
+          <colspec align="left" />
+
+          <thead>
+            <row>
+              <entry align="center">Port (Protocol)</entry>
+
+              <entry align="center">Usage</entry>
+            </row>
+          </thead>
+
+          <tbody>
+            <row>
+              <entry>3306 (TCP)</entry>
+
+              <entry>Client connections</entry>
+            </row>
+
+            <row>
+              <entry>4567 (UDP/TCP)</entry>
+
+              <entry>Galera cluster replication with multicasting</entry>
+            </row>
+
+            <row>
+              <entry>4568 (TCP)</entry>
+
+              <entry>Incremental state transfer</entry>
+            </row>
+
+            <row>
+              <entry>4444 (TCP)</entry>
+
+              <entry>State snapshot transfer</entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+
+      <para>The following ports should be accessible externally and translated
+      to the Virtual IP side as shown below:</para>
+
+      <table>
+        <title>Ports for Virtual IP</title>
+
+        <tgroup cols="3">
+          <colspec align="left" />
+
+          <thead>
+            <row>
+              <entry align="center">External Port (Protocol)</entry>
+
+              <entry align="center">Usage</entry>
+
+              <entry align="center">Local Port (Protocol)</entry>
+            </row>
+          </thead>
+
+          <tbody>
+            <row>
+              <entry>443 (TCP)</entry>
+
+              <entry>HTTPS to/back HTTP</entry>
+
+              <entry>80 (TCP)</entry>
+            </row>
+
+            <row>
+              <entry>4334 (TCP)</entry>
+
+              <entry>NETCONF call-home</entry>
+
+              <entry>4334 (TCP)</entry>
+            </row>
+
+            <row>
+              <entry>7000 - 7009 (TCP)</entry>
+
+              <entry>Reverse SSH connection pool</entry>
+
+              <entry>7000 - 7009 (TCP)</entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+    </section>
+
+    <section id="ha_installation">
+      <title>Installing High Availability</title>
+
+      <para>The Enea Edge Management application can be installed in High
+      Availability mode with a MariaDB database cluster by performing the
+      following steps. The mandatory Java configuration is also
+      detailed.</para>
+
+      <section id="ha_mariadb">
+        <title>Installing and configuring the MariaDB cluster</title>
+
+        <para>Install the latest MariaDB packages on all servers.</para>
+
+        <note>
+          <para>The setup was tested using MariaDB 10.5.8, built for CentOS
+          7.</para>
+        </note>
+
+        <para><emphasis role="bold">How to install MariaDB</emphasis></para>
+
+        <orderedlist>
+          <listitem>
+            <para>Install the MariaDB official yum repository. Create a file
+            named <literal>mariadb.repo</literal> in
+            <literal>/etc/yum.repos.d/</literal> with the following
+            content:</para>
+
+            <programlisting># MariaDB 10.5 CentOS repository list - created 2021-02-16 08:46 UTC
+# http://downloads.mariadb.org/mariadb/repositories/
+[mariadb]
+name = MariaDB
+baseurl = http://yum.mariadb.org/10.5/centos7-amd64
+gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB
+gpgcheck=1
+</programlisting>
+
+            <note>
+              <para>For more information about setting the repository, consult
+              <ulink
+              url="https://downloads.mariadb.org/mariadb/repositories/#mirror=nxtHost">Downloads
+              - Setting up MariaDB Repositories</ulink>.</para>
+            </note>
+          </listitem>
+
+          <listitem>
+            <para>Make sure the following packages are installed:</para>
+
+            <programlisting>MariaDB-compat-10.5.8-1.el7.centos.x86_64
+MariaDB-common-10.5.8-1.el7.centos.x86_64
+MariaDB-server-10.5.8-1.el7.centos.x86_64
+MariaDB-client-10.5.8-1.el7.centos.x86_64
+galera-4-26.4.6-1.el7.centos.x86_64</programlisting>
+
+            <para>These provide the MariaDB server, client and the Galera
+            <literal>wsrep</literal> provider library.</para>
+          </listitem>
+
+          <listitem>
+            <para>Copy the <literal>wsrep</literal> template:</para>
+
+            <programlisting>[root@localhost ~]# cp /usr/share/mysql/wsrep.cnf /etc/my.cnf.d
+            </programlisting>
+          </listitem>
+
+          <listitem>
+            <para>Change the following configuration in
+            <filename>/etc/my.cnf.d/wsrep.cnf</filename>:</para>
+
+            <programlisting># Full path to wsrep provider library or 'none'
+<emphasis role="bold">wsrep_provider=/usr/lib64/galera-4/libgalera_smm.so</emphasis>
+
+# Provider specific configuration options
+#wsrep_provider_options=
+
+# Logical cluster name. Should be the same for all nodes.
+<emphasis role="bold">wsrep_cluster_name="ucpemanager"</emphasis>
+
+# Group communication system handle
+<emphasis role="bold">wsrep_cluster_address="gcomm://192.168.10.11,192.168.10.12,..,192.168.10.16"</emphasis>
+
+# Human-readable node name (non-unique). Hostname by default.
+<emphasis role="bold">wsrep_node_name=Node1</emphasis> # current node's name. set node name for each server in \
+the cluster
+
+# Base replication &lt;address|hostname&gt;[:port] of the node.
+# The values supplied will be used as defaults for state transfer receiving,
+# listening ports and so on. Default: address of the first network interface.\
+<emphasis role="bold">wsrep_node_address=192.168.10.11</emphasis> 
+#current node's interface IP . must be set for each node in the cluster</programlisting>
+
+            <note>
+              <para>Steps 2, 3 and 4 must be performed for each MariaDB node
+              in the cluster.</para>
+            </note>
+          </listitem>
+
+          <listitem>
+            <para>Bootstrap the first node in the cluster (referred to as
+            <literal>Node1</literal> in this example), by running:</para>
+
+            <programlisting>[root@localhost ~]# galera_new_cluster</programlisting>
+
+            <para>This script passes the
+            <literal>--wsrep-new-cluster</literal> to
+            <literal>mysqld</literal> which tells the node that there is no
+            pre-existing cluster to connect to. The node will create a new
+            UUID to identify the new cluster.</para>
+
+            <note>
+              <para>Do not execute this script when connecting to an existing
+              cluster. It will create a new UUID to identify the cluster
+              again, and the node won't reconnect to the old cluster.</para>
+            </note>
+          </listitem>
+
+          <listitem>
+            <para>Go to <literal>Node1</literal> and start the service:</para>
+
+            <programlisting>[root@localhost ~]# systemctl start mariadb</programlisting>
+
+            <para>Subsequently, start the service on the other servers.</para>
+          </listitem>
+
+          <listitem>
+            <para>Verify that the nodes have entered the cluster:</para>
+
+            <programlisting>[root@localhost ~]# mysql --host=localhost --user=root -p
+MariaDB [(none)]&gt; show status like 'wsrep_cluster_conf_%';
++-----------------------+-------+
+| Variable_name         | Value |
++-----------------------+-------+
+| wsrep_cluster_conf_id | 3     |
++-----------------------+-------+
+1 row in set (0.001 sec)</programlisting>
+          </listitem>
+
+          <listitem>
+            <para>Run the initial configuration script (only once, on one of
+            the machines in the cluster):</para>
+
+            <programlisting>[root@localhost ~]# mysql_secure_installation
+
+Switch to unix_socket authentication [Y/n] <emphasis role="bold">Y</emphasis>
+Enabled successfully!
+Reloading privilege tables..
+ ... Success!
+…
+Change the root password? [Y/n] <emphasis role="bold">Y</emphasis>
+New password: 
+Re-enter new password: 
+Password updated successfully!
+Reloading privilege tables..
+ ... Success!
+…
+Remove anonymous users? [Y/n] <emphasis role="bold">Y</emphasis>
+ ... Success!
+…
+Disallow root login remotely? [Y/n] <emphasis role="bold">Y</emphasis>
+ ... Success!
+…
+Remove test database and access to it? [Y/n] <emphasis role="bold">Y (optional)</emphasis>
+ - Dropping test database...
+ ... Success!
+ - Removing privileges on test database...
+ ... Success!
+Reload privilege tables now? [Y/n] <emphasis role="bold">Y</emphasis>
+ ... Success!
+
+Cleaning up...
+
+All done!  If you've completed all of the above steps, your MariaDB
+installation should now be secure.
+
+Thanks for using MariaDB!</programlisting>
+          </listitem>
+
+          <listitem>
+            <para>Create the initial database and grant access to it:</para>
+
+            <programlisting>[root@localhost application]# mysql --host=localhost --user=root -p
+MariaDB [(none)]&gt; CREATE DATABASE ucpemanager CHARACTER SET='utf8' \
+COLLATE='utf8_bin';
+Query OK, 1 row affected (0.004 sec)
+
+MariaDB [(none)]&gt; GRANT ALL PRIVILEGES ON ucpemanager.* \
+TO 'enea'@'%' IDENTIFIED BY 'somepassword' WITH GRANT OPTION;</programlisting>
+          </listitem>
+        </orderedlist>
+      </section>
+
+      <section id="ha_java_sdk_install">
+        <title>Installing the Java SDK</title>
+
+        <para>Please refer to <olink
+        targetdoc="book_enea_edge_getting_started"
+        targetptr="openjdk_postgresql_config">Configuring OpenJDK and
+        PostgreSQL in the <xi:include
+        href="../../s_docbuild/olinkdb/pardoc-names.xml"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_edge_getting_started/1)" /></olink>
+        Manual, for details on how to install and configure Java
+        OpenJDK.</para>
+
+        <para>Make sure the <literal>JAVA_HOME</literal> variable points to
+        the OpenJDK 11 installation:</para>
+
+        <programlisting>[root@localhost ~]# echo $JAVA_HOME
+/usr/lib/jvm/java-11-openjdk-11.0.10.0.9-0.el7_9.x86_64
+</programlisting>
+      </section>
+
+      <section id="ha_ucpe_mg">
+        <title>Installing the Enea Edge Management application in High
+        Availabilty mode</title>
+
+        <para>These steps must be taken on each of the CentOS 7 machines that
+        will host the Enea Edge Management application. It will be installed
+        and the setup for the external database cluster will be
+        prepared.</para>
+
+        <para>As the root user, go to the distribution folder of the Enea Edge
+        Management application, and run:</para>
+
+        <programlisting>[root@localhost distro]#./install.sh /opt/ \
+Enea_NFV_Access_uCPEManager_2.3.0-build23.tar.gz
+This will install the Enea Edge Management application into the /opt/ucpemanager folder.
+Select the following options, while asked by the installation script:
+Are you using the embedded PostgreSQL database? [Y/N]: <emphasis role="bold">N</emphasis>
+External database selected, getting user information ...
+Press 1 for PostgreSQL, 2 for MariaDB, 3 for SQL Server, 4 for Oracle and 5 \
+for MySQL: <emphasis role="bold">2</emphasis>
+Specify database server name(s) or IP Address(es): \
+<emphasis role="bold">192.168.10.11,192.168.10.12,…,192.168.10.16 *(see note)</emphasis>
+Specify database ID (or name) [ucpemanager]: 
+Specify database server port [3306]: 
+Specify database user name [root]: enea
+Specify database password [root]: somepassword
+Specify database startup thread pool size [1]: 
+Creating database configuration file \
+/opt/ucpemanager/application/config/databaseConfig.xml ...
+Done .
+…
+Installing ucpemanager service ..
+Specify service username [ucpemanager]: 
+Specify service password [ucpemanager]: somepassword
+…
+Specify the IP address of the local interface: <emphasis role="bold">192.168.10.11</emphasis>
+Is this server part of a cluster? [Y/N]: <emphasis role="bold">Y</emphasis>
+Specify the name of the cluster [ucpemanager]: 
+Specify the shared (virtual) cluster IP address: <emphasis role="bold">192.168.10.10</emphasis>
+Specify the netmask for the cluster IP address [255.255.255.0]: 
+Specify the IP address of the (optional) arbiter: <emphasis role="bold">192.168.10.13</emphasis>
+Specify the port associated with the (optional) arbiter [3306]: 
+HA Configuration files modified successfully.
+Configuration complete.</programlisting>
+
+        <note>
+          <para>For each Enea Edge Management installation, place the local
+          interface IP first in the list of IPs. This will optimize database
+          communication, since the Enea Edge Management application uses the
+          list of IPs sequentially, therefore using the internal loopback
+          interface for communicating with the database.</para>
+        </note>
+
+        <para>The arbiter IP and port are used to mitigate split brain
+        situations. Providing an empty arbiter IP implies that no arbiter
+        checking is enabled - in other words, it implies that arbiter
+        connectivity is not checked. It is highly recommended to introduce an
+        arbiter to help with split brain scenarios. For instance, one of the
+        MariaDB cluster nodes can be used, with the default port
+        <literal>3306</literal> (the MariaDB listening port).</para>
+
+        <para>Once the servers are up and running, log into the <emphasis
+        role="bold">Primary</emphasis> and go to <emphasis
+        role="bold">System</emphasis> and select <emphasis role="bold">Cluster
+        View</emphasis>. The list of Enea Edge Management servers should be
+        displayed, with one listed as Primary and the rest as Backup.</para>
+        
+        <note><para>To avoid split-brain (network-partitioning) scenarios, it is possible 
+          for the user to specify an IP:port tuple for a system that acts as an 
+          Arbiter. In case both Primary and Backup servers cannot reach the Arbiter, 
+          there will be no Primary system to connect to and the management services 
+          will be unavailable.</para>
+        
+        <para>This can be manually remedied by either fixing the network situation 
+          that caused the partitioning or modifying Arbiter information in the 
+          configuration file on the server that the user decides should be the 
+          (one and only) Primary server.</para></note>
+
+        <para><remark>ELCCR-907</remark>At times the VIP address is not
+        acquired by any of the backup nodes if a power failure happens on
+        primary node in a High Availability setup. To recover, follow the
+        official documentation available at <ulink
+        url="https://mariadb.com/kb/en/galera-cluster-recovery/">Galera
+        Cluster Recovery</ulink>.</para>
+
+        <para>To change the configuration at a later point after the
+        installation, either uninstall and then reinstall the product, or
+        contact Enea Support.</para>
+      </section>
+    </section>
+
+    <section id="ha_upgrade">
+      <title>Upgrading a High Availability Deployment</title>
+
+      <para>Upgrading a High Availabilty deployment is a highly complex,
+      multi-step process that requires care to ensure both consistency and
+      high-availability. Some steps need to be done manually.</para>
+
+      <orderedlist>
+        <listitem>
+          <para>We start with the assumption that
+          <literal>EneaEdgeManagement-1 </literal>is the "PRIMARY"
+          server.</para>
+        </listitem>
+
+        <listitem>
+          <para>Shut down database services on one side of the network, for
+          example: MariaDB-4, MariaDB-5 and MariaDB-6.</para>
+        </listitem>
+
+        <listitem>
+          <para>Disconnect the network interfaces towards the VPN for machines
+          MariaDB-4, MariaDB-5 and MariaDB-6. This will prevent any attempts
+          at failover/synchronization.</para>
+        </listitem>
+
+        <listitem>
+          <para>Run the upgrade process on
+          <literal>EneaEdgeManagement-3</literal> and
+          <literal>EneaEdgeManagement-4</literal>. This will upgrade the
+          service to the current release. Once the upgrade process completes,
+          shutdown the Enea Edge Management service on both machines.</para>
+        </listitem>
+
+        <listitem>
+          <para>Disconnect the <literal>EneaEdgeManagement-2</literal> machine
+          from the network (which will take MariaDB-2 offline as well). At
+          this point, only the "PRIMARY" server is running, this is the start
+          of the interval when we are susceptible to single-server
+          failure.</para>
+        </listitem>
+
+        <listitem>
+          <para>Shutdown the MariaDB-2 process and run the Enea Edge
+          Management upgrade process on
+          <literal>EneaEdgeManagement-2</literal>. This will upgrade the
+          service to the current release. Once the upgrade process completes,
+          shutdown the Enea Edge Management service on the machine.</para>
+        </listitem>
+
+        <listitem>
+          <para>Reconnect the network interfaces towards the VPN for MariaDB-4
+          (<literal>EneaEdgeManagement-3</literal>), MariaDB-5
+          (<literal>EneaEdgeManagement-4</literal>) and MariaDB-6
+          (<literal>EneaEdgeManagement-2</literal>). Restart database services
+          on MariaDB-2, MariaDB-4, MariaDB-5 and MariaDB-6. This will allow
+          database services on all machines to synchronize, any data that has
+          been modified during the upgrade process will be made
+          consistent.</para>
+        </listitem>
+
+        <listitem>
+          <para>Shutdown the "Primary" server
+          (<literal>EneaEdgeManagement-1</literal>). At this point, the
+          service is no longer available.</para>
+        </listitem>
+
+        <listitem>
+          <para>Start the Enea Edge Management service on
+          <literal>EneaEdgeManagement-2</literal>. This machine will come up
+          as the new "PRIMARY" with the upgraded software. As part of the
+          startup process, it will upgrade the database and perform any other
+          upgrade-related functionality.</para>
+        </listitem>
+
+        <listitem>
+          <para>At this point (once startup completes), service is available.
+          However, the system is still susceptible to single-server
+          failure.</para>
+        </listitem>
+
+        <listitem>
+          <para>Start the Enea Edge Management services on
+          <literal>EneaEdgeManagement-3</literal> and
+          <literal>EneaEdgeManagement-4</literal>. At this point, they will
+          operate in highly-available mode.</para>
+        </listitem>
+
+        <listitem>
+          <para>Upgrade the Enea Edge Management application on
+          <literal>EneaEdgeManagement-1</literal> (the one that has been shut
+          down). Once that upgrade is complete and the service restarts, the
+          entire setup has been upgraded to the new version.</para>
+        </listitem>
+      </orderedlist>
+    </section>
+  </section>
+</chapter>
diff --git a/doc/book-enea-edge-getting-started/doc/book.xml b/doc/book-enea-edge-getting-started/doc/book.xml
new file mode 100644
index 0000000..07021cb
--- /dev/null
+++ b/doc/book-enea-edge-getting-started/doc/book.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED">
+]>
+<book id="book_enea_edge_getting_started">
+  <title><trademark class="registered">Enea</trademark> Edge Getting
+  Started</title>
+
+  <subtitle>Release Version <xi:include
+  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xpointer="element(EneaLinux_REL_VER/1)" /></subtitle>
+
+  <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
+
+  <xi:include href="../../s_docbuild/template/docsrc_common/bookinfo_userdoc.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+  <xi:include href="introduction.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+  <xi:include href="installation_guide.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+  <xi:include href="upgrade_ena.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+  <xi:include href="advanced_configurations.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+  <xi:include href="net_config_options.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+  <xi:include href="vnf_mg.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+  <xi:include href="log_collector.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+  <xi:include href="grafana.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+  <xi:include href="troubleshooting.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude" />
+</book>
\ No newline at end of file
diff --git a/doc/book-enea-edge-getting-started/doc/grafana.xml b/doc/book-enea-edge-getting-started/doc/grafana.xml
new file mode 100644
index 0000000..807c2ac
--- /dev/null
+++ b/doc/book-enea-edge-getting-started/doc/grafana.xml
@@ -0,0 +1,361 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="grafana">
+  <title>Using Grafana and InfluxDB</title>
+
+  <para><ulink url="https://docs.influxdata.com/influxdb/">InfluxDB</ulink> is 
+    essentially a time series database process that runs on a server, while 
+    <ulink url="https://grafana.com/docs/grafana">Grafana</ulink> is a 
+    visualization tool for time series data. Grafana is a very lightweight 
+    server-side application, and most of the data monitoring runs in a browser.</para>
+  
+  <para>For details on version information for these two components, please refer to the 
+  <ns:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+        xmlns:ns="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_edge_telemetry_open_source/1)" />.</para>
+
+  <section id="telemetry_deployment">
+    <title>Deploying Grafana and InfluxDB</title>
+
+    <para>Grafana and InfluxDB can be deployed using images for Docker on
+    linux. These images are provided by Enea along with a deploy script and
+    predefined dashboards. The Grafana and InfluxDB images can be deployed on
+    the same machine or on separate machines.</para>
+
+    <section id="prereq_deploy">
+      <title>Prerequisites for Deploying an Image</title>
+
+      <para>The following must be present in order to deploy an image:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>CentOS 7 Linux.</para>
+        </listitem>
+
+        <listitem>
+          <para>Internet connection for installing the Docker tool.</para>
+        </listitem>
+
+        <listitem>
+          <para>Root rights on the CentOS 7 machine.</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+
+    <section id="docker_steps">
+      <title>Setting up Docker for Grafana and InfluxDB</title>
+
+      <para>In order to use the Grafana and InfluxDB containers, the Docker
+      tool that runs and manages containers needs to be available on the
+      server.</para>
+
+      <para>To install Docker on a CentOS 7 server open a terminal, log into a
+      bash shell with the root account and run the following commands:</para>
+
+      <orderedlist>
+        <listitem>
+          <para><literal>yum check-update</literal></para>
+        </listitem>
+
+        <listitem>
+          <para><literal>yum install -y yum-utils
+          device-mapper-persistent-data lvm2</literal></para>
+        </listitem>
+
+        <listitem>
+          <para><literal>yum-config-manager --add-repo
+          https://download.docker.com/linux/centos/docker-ce.repo</literal></para>
+        </listitem>
+
+        <listitem>
+          <para><literal>yum install docker</literal></para>
+        </listitem>
+      </orderedlist>
+
+      <para>In order to deploy the Grafana and InfluxDB images, the Docker
+      service needs to be started. To start the Docker service, log into a
+      bash shell with the root account and run the following command:
+      <literal>systemctl start docker</literal>.</para>
+
+      <note>
+        <para>By default, the Docker service is not configured to start at
+        boot. In order to configure it to autostart, log into a bash shell
+        with the root account and run the following command:
+        <literal>systemctl enable docker</literal>. The Grafana and InfluxDB
+        images are configured to autostart when the Docker service
+        starts.</para>
+      </note>
+    </section>
+
+    <section id="deploy_steps">
+      <title>Deploying Grafana and InfluxDB</title>
+
+      <para>On the CentOS 7 server open a terminal, log into a bash shell with
+      the root account and perform the following:</para>
+
+      <orderedlist>
+        <listitem>
+          <para>Extract
+          <filename>Enea_Edge_Telemetry_Deploy_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename>.</para>
+
+          <para>The directory in which the archive will be unpacked will be
+          denoted as:
+          <literal>&lt;Telemetry-installerdir&gt;</literal>.</para>
+        </listitem>
+
+        <listitem>
+          <para>Enter
+          <literal>&lt;Telemetry-installerdir&gt;</literal>.</para>
+        </listitem>
+
+        <listitem>
+          <para>Run the provided <filename>telemetry_deploy.sh</filename>
+          script.</para>
+        </listitem>
+
+        <listitem>
+          <para>When prompted, select what images you want to deploy. Select
+          <literal>Both</literal> unless you wish for the Grafana and InfluxDB
+          images to be on separate servers.</para>
+
+          <note>
+            <para>If an image is already deployed, you will be prompted to
+            replace it.</para>
+
+            <para>By default, Grafana is configured for deployment on the same
+            server as InfluxDB. Please read the Grafana documentation on how
+            to configure it if you wish to deploy the images on separate
+            servers.</para>
+          </note>
+        </listitem>
+
+        <listitem>
+          <para>During the InfluxDB deployment, you will be prompted to
+          provide a username and password. These must match the ones
+          configured in the Enea Edge Management application for
+          Telemetry.</para>
+
+          <note>
+            <para>Changing the InfluxDB username and password requires
+            redeploying the InfluxDB image.</para>
+          </note>
+        </listitem>
+
+        <listitem>
+          <para>Verify the installation by running the command <literal>docker
+          ps -a</literal>. The Grafana and InfluxDB containers should be
+          present and have the status <literal>Up</literal>.</para>
+        </listitem>
+      </orderedlist>
+
+      <note>
+        <para>The provided Grafana instance by default uses the
+        <literal>Username:</literal> <emphasis role="bold">admin</emphasis>
+        and <literal>Password:</literal> <emphasis
+        role="bold">admin</emphasis>.</para>
+      </note>
+    </section>
+  </section>
+
+  <section id="telemetry_firewall_settings">
+    <title>Firewall settings for Grafana and InfluxDB</title>
+
+    <para>If a firewall is running on the machines where Grafana and InfluxDB
+    are deployed, this firewall needs to be configured so the required ports
+    are enabled.</para>
+
+    <para>To enable the ports, log into a bash shell with the root account and
+    perform the following:</para>
+
+    <orderedlist>
+      <listitem>
+        <para>For InfluxDB, run the following command:</para>
+
+        <programlisting>firewall-cmd --permanent --add-port=25826/tcp</programlisting>
+      </listitem>
+
+      <listitem>
+        <para>For Grafana, run the following command:</para>
+
+        <programlisting>firewall-cmd --permanent --add-port=3000/tcp</programlisting>
+      </listitem>
+    </orderedlist>
+  </section>
+
+  <section id="grafana_settings">
+    <title>Setting Grafana and InfluxDB parameters</title>
+
+    <para>Customizing InfluxDB and Grafana parameters can be done in the Enea
+    Edge Management GUI by selecting the <emphasis
+    role="bold">System</emphasis> menu, then <emphasis
+    role="bold">Configuration</emphasis>, accessing the <emphasis
+    role="bold">Properties</emphasis> tab, and clicking on the <emphasis
+    role="bold">Telemetry</emphasis> tab. The settings that can be changed are
+    listed in the table below:</para>
+
+    <table>
+      <title>Telemetry settings</title>
+
+      <tgroup cols="3">
+        <colspec align="left" colname="1" colwidth="1*" />
+
+        <colspec align="left" colname="2" colwidth="3*" />
+
+        <colspec align="left" colname="3" colwidth="1*" />
+
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Field name</emphasis></entry>
+
+            <entry><emphasis role="bold">Description</emphasis></entry>
+
+            <entry><emphasis role="bold">Default value</emphasis></entry>
+          </row>
+
+          <row>
+            <entry>Grafana Hostname or IP Address</entry>
+
+            <entry>The public hostname or IP address where the Grafana
+            instance is installed.</entry>
+
+            <entry>no default</entry>
+          </row>
+
+          <row>
+            <entry>Grafana Port</entry>
+
+            <entry>The port Grafana uses.</entry>
+
+            <entry>3000</entry>
+          </row>
+
+          <row>
+            <entry>Grafana Dashboard</entry>
+
+            <entry>The dashboard that should be used when opening Grafana
+            using the Enea Edge Management application.</entry>
+
+            <entry>host</entry>
+          </row>
+
+          <row>
+            <entry>InfluxDB Hostname or IP Address</entry>
+
+            <entry>The public hostname or IP address where the InfluxDB
+            database is installed.</entry>
+
+            <entry>no default</entry>
+          </row>
+
+          <row>
+            <entry>InfluxDB Port</entry>
+
+            <entry>The port used for communication between InfluxDB and the
+            Telemetry server.</entry>
+
+            <entry>25826</entry>
+          </row>
+
+          <row>
+            <entry>InfluxDB Username</entry>
+
+            <entry>The username used for encrypting communication between
+            InfluxDB and the Telemetry server.</entry>
+
+            <entry>admin0</entry>
+          </row>
+
+          <row>
+            <entry>InfluxDB Password</entry>
+
+            <entry>The password used for encrypting communication between
+            InfluxDB and the Telemetry server.</entry>
+
+            <entry>admin</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+
+    <para>When changing any of the settings in the <emphasis
+    role="bold">Telemetry</emphasis> tab, the Enea Edge Management application
+    will inform all uCPE devices of the change if they have telemetry
+    running.</para>
+
+    <figure>
+      <title>Telemetry Properties</title>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata contentwidth="615"
+                     fileref="images/telemetry_settings.png" />
+        </imageobject>
+      </mediaobject>
+    </figure>
+  </section>
+
+  <section id="telemetry_start_stop">
+    <title>Starting and stopping Telemetry</title>
+
+    <para>When a uCPE Device is selected, in the <emphasis
+    role="bold">Operations</emphasis> menu, the <emphasis role="bold">Start
+    Telemetry</emphasis> and <emphasis role="bold">Stop Telemetry</emphasis>
+    options are available.</para>
+
+    <para>When starting Telemetry for a uCPE device, the Enea Edge Management
+    application sends the following information about the InfluxDB:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>The IP address and hostname where InfluxDB is installed.</para>
+      </listitem>
+
+      <listitem>
+        <para>The port used for communication between InfluxDB and the
+        Telemetry server.</para>
+      </listitem>
+
+      <listitem>
+        <para>The credentials used for encrypting communication between
+        InfluxDB and the Telemetry server.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>These fields are read-only and are populated with the values already
+    set in the <emphasis role="bold">System Configuration</emphasis>. If one
+    of the fields is not set or if it does not have the desired value, modify
+    it in the <emphasis role="bold">System Configuration</emphasis>. The
+    password is sent encrypted using the Base64 scheme.</para>
+
+    <figure>
+      <title>Telemetry Start Dialog</title>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata contentwidth="615" fileref="images/telemetry_start.png" />
+        </imageobject>
+      </mediaobject>
+    </figure>
+
+    <para>When the Telemetry status is changed on a uCPE device, a
+    notification is sent to the Enea Edge Management application. These
+    notifications can be inspected under <emphasis
+    role="bold">Fault</emphasis> found in the <emphasis
+    role="bold">Event</emphasis> menu.</para>
+  </section>
+
+  <section id="grafana_launch">
+    <title>Launching Grafana</title>
+
+    <para>When a uCPE Device is selected, the <emphasis
+    role="bold">Telemetry</emphasis> button is available. Pressing this button
+    will open a new window pointing to Grafana. The current uCPE device will
+    be selected in Grafana.</para>
+
+    <para>The hostname or IP Address and the port of the Grafana installation
+    can be customized by selecting <emphasis role="bold">System</emphasis>,
+    then the <emphasis role="bold">Configuration</emphasis> menu, accessing
+    the <emphasis role="bold">Properties</emphasis> tab, and clicking on the
+    <emphasis role="bold">Telemetry</emphasis> tab. The default dashboard
+    available when launching Grafana can be customized as well.</para>
+  </section>
+</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/archive_list.png b/doc/book-enea-edge-getting-started/doc/images/archive_list.png
index 302f32d..302f32d 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/archive_list.png
+++ b/doc/book-enea-edge-getting-started/doc/images/archive_list.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/collect_debug_logs.png b/doc/book-enea-edge-getting-started/doc/images/collect_debug_logs.png
index 6582737..6582737 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/collect_debug_logs.png
+++ b/doc/book-enea-edge-getting-started/doc/images/collect_debug_logs.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/debug_settings.png b/doc/book-enea-edge-getting-started/doc/images/debug_settings.png
index 2c97b2c..2c97b2c 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/debug_settings.png
+++ b/doc/book-enea-edge-getting-started/doc/images/debug_settings.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/dev_file_mg.png b/doc/book-enea-edge-getting-started/doc/images/dev_file_mg.png
index a4a4f5c..a4a4f5c 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/dev_file_mg.png
+++ b/doc/book-enea-edge-getting-started/doc/images/dev_file_mg.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/download_files.png b/doc/book-enea-edge-getting-started/doc/images/download_files.png
index cb686e4..cb686e4 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/download_files.png
+++ b/doc/book-enea-edge-getting-started/doc/images/download_files.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/edit_inter.png b/doc/book-enea-edge-getting-started/doc/images/edit_inter.png
index fddde37..fddde37 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/edit_inter.png
+++ b/doc/book-enea-edge-getting-started/doc/images/edit_inter.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/edit_inter_config.png b/doc/book-enea-edge-getting-started/doc/images/edit_inter_config.png
index f9ab8aa..f9ab8aa 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/edit_inter_config.png
+++ b/doc/book-enea-edge-getting-started/doc/images/edit_inter_config.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/fault_events.png b/doc/book-enea-edge-getting-started/doc/images/fault_events.png
index aeec955..aeec955 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/fault_events.png
+++ b/doc/book-enea-edge-getting-started/doc/images/fault_events.png
diff --git a/doc/book-enea-edge-getting-started/doc/images/high_av_setup.png b/doc/book-enea-edge-getting-started/doc/images/high_av_setup.png
new file mode 100644
index 0000000..d119ecb
--- /dev/null
+++ b/doc/book-enea-edge-getting-started/doc/images/high_av_setup.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/onboard_a_vnf_image.png b/doc/book-enea-edge-getting-started/doc/images/onboard_a_vnf_image.png
index da52202..da52202 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/onboard_a_vnf_image.png
+++ b/doc/book-enea-edge-getting-started/doc/images/onboard_a_vnf_image.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/ovs_bridges_tab.png b/doc/book-enea-edge-getting-started/doc/images/ovs_bridges_tab.png
index 0b3ec54..0b3ec54 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/ovs_bridges_tab.png
+++ b/doc/book-enea-edge-getting-started/doc/images/ovs_bridges_tab.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/prep_deploy.png b/doc/book-enea-edge-getting-started/doc/images/prep_deploy.png
index 2db2487..2db2487 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/prep_deploy.png
+++ b/doc/book-enea-edge-getting-started/doc/images/prep_deploy.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/prep_execution.png b/doc/book-enea-edge-getting-started/doc/images/prep_execution.png
index 404760b..404760b 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/prep_execution.png
+++ b/doc/book-enea-edge-getting-started/doc/images/prep_execution.png
diff --git a/doc/book-enea-edge-getting-started/doc/images/telemetry_settings.png b/doc/book-enea-edge-getting-started/doc/images/telemetry_settings.png
new file mode 100644
index 0000000..276b716
--- /dev/null
+++ b/doc/book-enea-edge-getting-started/doc/images/telemetry_settings.png
diff --git a/doc/book-enea-edge-getting-started/doc/images/telemetry_start.png b/doc/book-enea-edge-getting-started/doc/images/telemetry_start.png
new file mode 100644
index 0000000..81510b5
--- /dev/null
+++ b/doc/book-enea-edge-getting-started/doc/images/telemetry_start.png
diff --git a/doc/book-enea-edge-getting-started/doc/images/vnf_space.png b/doc/book-enea-edge-getting-started/doc/images/vnf_space.png
new file mode 100755
index 0000000..57ed581
--- /dev/null
+++ b/doc/book-enea-edge-getting-started/doc/images/vnf_space.png
diff --git a/doc/book-enea-edge-getting-started/doc/images/wap_external_interface.png b/doc/book-enea-edge-getting-started/doc/images/wap_external_interface.png
new file mode 100644
index 0000000..ee49fc1
--- /dev/null
+++ b/doc/book-enea-edge-getting-started/doc/images/wap_external_interface.png
diff --git a/doc/book-enea-edge-getting-started/doc/images/wap_wireless_ap.png b/doc/book-enea-edge-getting-started/doc/images/wap_wireless_ap.png
new file mode 100644
index 0000000..b7c77bf
--- /dev/null
+++ b/doc/book-enea-edge-getting-started/doc/images/wap_wireless_ap.png
diff --git a/doc/book-enea-edge-getting-started/doc/installation_guide.xml b/doc/book-enea-edge-getting-started/doc/installation_guide.xml
new file mode 100644
index 0000000..477b5c4
--- /dev/null
+++ b/doc/book-enea-edge-getting-started/doc/installation_guide.xml
@@ -0,0 +1,1255 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="installation_guide">
+  <title>Setting up and Installing the Enea Edge Base Configuration</title>
+
+  <para>The setup and installation steps detailed below will deploy a base
+  configuration which will be used as a reference for more complex deployment
+  scenarios.</para>
+
+  <section id="hw_reqs">
+    <title>Hardware Requirements</title>
+
+    <para>The following hardware is needed for deploying the base
+    configuration:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>One server running the CentOS 7 distribution</para>
+
+        <note>
+          <para>The CentOS 7 server must be updated to the latest revision
+          before installing Enea Edge, and configured for English language
+          usage.</para>
+        </note>
+
+        <para>The following will detail CPU, RAM and storage requirements for
+        the Enea Edge Management application:</para>
+
+        <itemizedlist>
+          <listitem>
+            <para>For small-sized deployments (tens of devices):</para>
+
+            <itemizedlist spacing="compact">
+              <listitem>
+                <para>4 cores</para>
+              </listitem>
+
+              <listitem>
+                <para>16 GB RAM</para>
+              </listitem>
+
+              <listitem>
+                <para>300 GB single disk storage</para>
+              </listitem>
+            </itemizedlist>
+          </listitem>
+
+          <listitem>
+            <para>For mid-sized deployments (hundreds of devices):</para>
+
+            <itemizedlist spacing="compact">
+              <listitem>
+                <para>8 cores</para>
+              </listitem>
+
+              <listitem>
+                <para>32 GB RAM</para>
+              </listitem>
+
+              <listitem>
+                <para>300 GB single disk storage</para>
+              </listitem>
+            </itemizedlist>
+          </listitem>
+
+          <listitem>
+            <para>For large deployments (thousands of devices):</para>
+
+            <itemizedlist spacing="compact">
+              <listitem>
+                <para>16 cores</para>
+              </listitem>
+
+              <listitem>
+                <para>64-256 GB RAM</para>
+              </listitem>
+
+              <listitem>
+                <para>1-2 TB single disk storage</para>
+              </listitem>
+            </itemizedlist>
+          </listitem>
+        </itemizedlist>
+
+        <para>The purpose of the CentOS 7 server is to host the Enea Edge
+        Management application. Network access between the CentOS 7 server and
+        the uCPE devices is required. The Enea Edge Management application and
+        the uCPE devices will be connected on separate subnets to avoid
+        inconsistencies.</para>
+      </listitem>
+
+      <listitem>
+        <para>One or more uCPE devices.</para>
+
+        <para>Whitebox devices where the Enea Edge Runtime will be installed,
+        containing a minimum of 2 cores and 4 GB RAM and at least two ethernet
+        ports that will be configured as WAN and LAN during deployment.</para>
+
+        <para>When hosting an entire solution including one or several network
+        services, the hardware must also have the resources to host one or
+        more VNFs. During a typical evaluation, a dual VNF service on the Enea
+        Edge Runtime needs a CPU with 4-8 cores and at least 8 GB RAM. The
+        supported Intel CPUs of Enea Edge are documented in the <xi:include
+        href="../../s_docbuild/olinkdb/pardoc-common.xml"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_edge_release_info/1)" /> Manual.</para>
+
+        <para>Enea Edge Runtime needs EFI support in BIOS to boot. When
+        configuring the uCPE device BIOS a serial connection is
+        required.</para>
+      </listitem>
+
+      <listitem>
+        <para>A laptop.</para>
+
+        <para>The laptop is used for 2 scenarios:</para>
+
+        <itemizedlist>
+          <listitem>
+            <para>Installing the Enea Edge Runtime on uCPE Devices.</para>
+          </listitem>
+
+          <listitem>
+            <para>Connecting to the GUI of the Enea Edge Management
+            application for management and configuration. Network access
+            between the CentOS 7 server and the laptop is required. Please see
+            the <xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+            xmlns:xi="http://www.w3.org/2001/XInclude"
+            xpointer="element(book_enea_edge_release_info/1)" /> Manual
+            available with your release, for recommended browsers.</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para>A 16 GB USB stick used for the uCPE Device Installation.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section id="sw_config">
+    <title>Software Configuration</title>
+
+    <para>The CentOS 7 server requires a specific configuration for the setup
+    to work.</para>
+
+    <section id="firewall_config">
+      <title>Firewall Configuration</title>
+
+      <para>Any firewall running on the CentOS 7 server may block the
+      management protocols required to communicate between the uCPE device and
+      the Enea Edge Management application as well as between the Enea Edge
+      Management application and its northbound clients. Quick handling of a
+      blocking firewall would be to disable it, typical for a lab environment,
+      through:</para>
+
+      <programlisting>sudo systemctl stop firewalld
+sudo systemctl disable firewalld
+sudo systemctl mask now firewalld</programlisting>
+
+      <para>For an advanced firewall configuration, the following ports need
+      to be opened:</para>
+
+      <table>
+        <title>Ports to be Activated</title>
+
+        <tgroup cols="3">
+          <colspec align="left" />
+
+          <tbody>
+            <row>
+              <entry>80</entry>
+
+              <entry>TCP</entry>
+
+              <entry>Required for GUI Access.</entry>
+            </row>
+
+            <row>
+              <entry>443</entry>
+
+              <entry>TCP</entry>
+
+              <entry>Required for GUI Access and Device Connectivity.</entry>
+            </row>
+
+            <row>
+              <entry>54327</entry>
+
+              <entry>UDP</entry>
+
+              <entry>Required for the Enea Edge Management application High
+              Availability Configuration.</entry>
+            </row>
+
+            <row>
+              <entry>5701:5708</entry>
+
+              <entry>TCP</entry>
+
+              <entry>Required for the Enea Edge Management application High
+              Availability Configuration.</entry>
+            </row>
+
+            <row>
+              <entry>4334</entry>
+
+              <entry>TCP</entry>
+
+              <entry>Required for Call Home.</entry>
+            </row>
+
+            <row>
+              <entry>2021:2040</entry>
+
+              <entry>TCP</entry>
+
+              <entry>Required for Call Home when connecting uCPE Devices using
+              Enea NFV Access 2.3.0 or older.</entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+
+      <para>Use the following command sequence to enable the required ports
+      for deployment of the Enea Edge Management application:</para>
+
+      <programlisting>sudo firewall-cmd --permanent --add-port=80/tcp
+sudo firewall-cmd --permanent --add-port=443/tcp
+sudo firewall-cmd --permanent --add-port=54327/udp
+sudo firewall-cmd --permanent --add-port=5701-5708/tcp
+sudo firewall-cmd --permanent --add-port=4334/tcp
+sudo firewall-cmd --permanent --add-port=2021-2040/tcp
+sudo firewall-cmd --reload</programlisting>
+
+      <note>
+        <para>If the Enea Edge Management host resides behind a corporate
+        port-filtering firewall, then all the aforementioned ports need to
+        also be enabled on the respective firewall. As an additional
+        requirement, port 22/TCP also needs to be enabled for reverse SSH to
+        the Enea Edge Management application.</para>
+
+        <para>No enabling and no forwarding rules are necessary for ports
+        2021-2040 if Enea Edge 2.4.0 or newer is used.</para>
+      </note>
+    </section>
+
+    <section id="openjdk_postgresql_config">
+      <title>Configuring OpenJDK and PostgreSQL</title>
+
+      <para>The Enea Edge Management application requires a specific Java
+      version (OpenJDK 11) and a PostgreSQL version to operate
+      correctly.</para>
+
+      <para><emphasis role="bold">Installing OpenJDK</emphasis></para>
+
+      <orderedlist spacing="compact">
+        <listitem>
+          <para>Install OpenJDK 11 using the root account:</para>
+
+          <programlisting>yum install java-11-openjdk-devel</programlisting>
+        </listitem>
+
+        <listitem>
+          <para>Verify the installation:</para>
+
+          <programlisting>java -version
+openjdk version "11.0.3" 2019-04-16 LTS
+OpenJDK Run Time Environment 18.9 (build 11.0.3+7-LTS)
+OpenJDK 64-Bit Server VM 18.9 (build 11.0.3+7-LTS, mixed mode, sharing)</programlisting>
+
+          <note>
+            <para>If there are multiple java versions installed, switch
+            between them using the following command:</para>
+
+            <programlisting>alternatives --config java</programlisting>
+
+            <para>Optionally, the user can switch between the
+            <literal>javac</literal> versions using:</para>
+
+            <programlisting>alternatives --config javac</programlisting>
+          </note>
+        </listitem>
+
+        <listitem>
+          <para>The following system variables need to point to the OpenJDK 11
+          installation:</para>
+
+          <programlisting>export JAVA_HOME=$(dirname $(dirname $(readlink $(readlink $(which java)))))
+export PATH=$PATH:$JAVA_HOME/bin
+export CLASSPATH=.:$JAVA_HOME/jre/lib:$JAVA_HOME/lib:$JAVA_HOME/lib/tools.jar</programlisting>
+
+          <note>
+            <para>In order to make these system variables persistent, the
+            commands given above should be added to a script in the
+            <literal>/etc/profile.d/</literal> folder. <emphasis
+            role="bold">Sudo</emphasis> access is needed for this
+            operation.</para>
+          </note>
+        </listitem>
+      </orderedlist>
+
+      <para>The Enea Edge Management application requires a specific
+      PostgreSQL version. This is embedded in the Enea Edge Management
+      installation. In order to avoid conflicts, any existing PostgreSQL
+      installation needs to be uninstalled.</para>
+
+      <para><emphasis role="bold">Uninstalling PostgreSQL</emphasis></para>
+
+      <orderedlist>
+        <listitem>
+          <para>Open a terminal with administrative rights, i.e. log into a
+          bash shell with root privileges.</para>
+        </listitem>
+
+        <listitem>
+          <para>Execute the following command to check if you have a currently
+          running PostgreSQL database server:</para>
+
+          <programlisting>ps -ef | grep post</programlisting>
+        </listitem>
+
+        <listitem>
+          <para>Remove the installed PostgreSQL server (including the existing
+          postgres user):</para>
+
+          <note>
+            <para>This step is not necessary if the Enea Edge Management
+            application will be using an external database (like
+            MariaDB).</para>
+          </note>
+
+          <programlisting>yum remove postgres\*
+rm -rf /var/lib/pgsql
+rm -f /etc/postgres-reg.ini
+userdel postgres</programlisting>
+        </listitem>
+      </orderedlist>
+
+      <para>If you have multiple spindles, it is recommended to let the
+      application run off one and the database off the other. This will result
+      in optimum performance. It is also recommended that the swap disk be the
+      same as the one used for the application.</para>
+
+      <para>Assuming another spindle is used (<literal>/drive2</literal>) do
+      the following:</para>
+
+      <orderedlist>
+        <listitem>
+          <para>Create a folder which will host the database (e.g.
+          <literal>emsDatabase</literal>).</para>
+        </listitem>
+
+        <listitem>
+          <para>Create a soft-link that will point to this folder:</para>
+
+          <programlisting>ln -s /opt/ems/elementcenter/database /drive2/emsDatabase</programlisting>
+        </listitem>
+
+        <listitem>
+          <para>Follow the installation steps for the Enea Edge Management
+          application available in <olink
+          targetdoc="book_enea_edge_getting_started"
+          targetptr="install_ucpe_mg">Installing the Enea Edge Management
+          application in the <xi:include
+          href="../../s_docbuild/olinkdb/pardoc-names.xml"
+          xmlns:xi="http://www.w3.org/2001/XInclude"
+          xpointer="element(book_enea_edge_getting_started/1)" /></olink>
+          Manual.</para>
+        </listitem>
+      </orderedlist>
+    </section>
+  </section>
+
+  <section id="ucpe_config">
+    <title>uCPE Device Configuration</title>
+
+    <section id="wan_lan_ports">
+      <title>Determining the WAN and LAN ports</title>
+
+      <para>A typical whitebox comes with multiple physical network ports,
+      ready to be used. The user must determine the purpose and allocation of
+      each port. The allocation is later aligned with the software
+      configuration within the Web-installer.</para>
+
+      <para>A common way is to allocate the left ports to WANs and the right
+      ports to LANs. At least one port must be allocated to WAN and one to
+      LAN.</para>
+    </section>
+
+    <section id="ucpe_identifier">
+      <title>Determining the Device ID</title>
+
+      <para>Each uCPE device needs a unique identifier. This identifier is
+      used to match the registration in the Enea Edge Management application
+      and the offline configuration of the uCPE device during ZTP (Zero Touch
+      Provisioning).</para>
+
+      <para>Select a text string to represent the uCPE device, e.g.
+      <literal>uCPE-1</literal> or <literal>fwa-t1012vc_boston_1234</literal>.
+      It can have any length and any type of characters with the exception of
+      quotation characters (' or ") or line terminators (\n or \r).</para>
+    </section>
+
+    <section id="bios_config">
+      <title>Configuring the BIOS</title>
+
+      <para>The factory configuration of the BIOS may not match the
+      requirements of Enea Edge Runtime. The BIOS configuration needs to be
+      reviewed and potentially reconfigured to prepare for a successful
+      installation.</para>
+
+      <para>Access the BIOS using a serial cable between the uCPE device and
+      the laptop, to review and configure the BIOS correctly. The whitebox
+      vendor is expected to provide the right serial cable for the box. A
+      terminal emulator (such as putty) is needed on the laptop.</para>
+
+      <para>Enable the following BIOS features/configurations:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>EFI</para>
+        </listitem>
+
+        <listitem>
+          <para>Intel Virtualization Technology (VT-x)</para>
+        </listitem>
+
+        <listitem>
+          <para>Intel Virtualization Technology for Directed I/O (VT-d)</para>
+        </listitem>
+
+        <listitem>
+          <para>SR-IOV</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The boot order may also need to be modified to support
+      installation and execution of the Enea Edge Runtime on the uCPE
+      device.</para>
+
+      <para>The following boot order is recommended for a base
+      configuration:</para>
+
+      <orderedlist>
+        <listitem>
+          <para>Boot from USB</para>
+        </listitem>
+
+        <listitem>
+          <para>Boot from Disk</para>
+        </listitem>
+      </orderedlist>
+
+      <para>By arranging the above boot order there is no need for a further
+      configuration of the BIOS during installation and deployment.</para>
+    </section>
+  </section>
+
+  <section id="prep_deploy">
+    <title>Preparing the Deployment</title>
+
+    <section id="install_ucpe_mg">
+      <title>Installing the Enea Edge Management application</title>
+
+      <para>The Enea Edge Management application can be installed using a
+      fresh (first-time) configuration or using a backup file of a previous
+      installation, created within the Enea Edge Management GUI.</para>
+
+      <section id="fresh_ucpemg_install">
+        <title>Fresh Installation of the Enea Edge Management
+        application</title>
+
+        <para>On the CentOS 7 server open a terminal, log into a bash shell
+        with the root account and perform the following:</para>
+
+        <orderedlist>
+          <listitem>
+            <para>Extract
+            <literal>Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</literal></para>
+
+            <para>The directory in which the archive has been unpacked will be
+            denoted as: <literal>&lt;uCPEM-installerdir&gt;</literal>.</para>
+          </listitem>
+
+          <listitem>
+            <para>Enter
+            <literal>&lt;uCPEM-installerdir&gt;/dist</literal>.</para>
+          </listitem>
+
+          <listitem>
+            <para>Choose the target installation folder, e.g.
+            <literal>/opt/ems</literal>. Everything will be installed under a
+            folder called <literal>/ucpemanager</literal> within the target
+            installation folder.</para>
+
+            <para>The application files will be installed in
+            <literal>/opt/ems/ucpemanager/application</literal>. The database
+            will be installed in
+            <literal>/opt/ems/ucpemanager/database</literal>.</para>
+          </listitem>
+
+          <listitem>
+            <para>Run the following interactive command:</para>
+
+            <programlisting>./install.sh /opt/ems \
+Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</programlisting>
+
+            <para>The default configuration values are specified in brackets.
+            If no other value is preferred and typed in, pressing
+            <literal>ENTER</literal> will keep the default values. When there
+            is an option within parentheses (i.e.Y/N), a value must be
+            specified.</para>
+
+            <note>
+              <para>The same configuration values set now will need to be
+              provided when upgrading or uninstalling the Enea Edge Management
+              application.</para>
+            </note>
+
+            <itemizedlist>
+              <listitem>
+                <para>Database Configurations:</para>
+
+                <itemizedlist spacing="compact">
+                  <listitem>
+                    <para>Are you using the embedded PostgreSQL database?
+                    [Y/N]: <literal>Y</literal>.</para>
+                  </listitem>
+
+                  <listitem>
+                    <para>Specify the database process password
+                    <literal>[postgres]</literal>:</para>
+                  </listitem>
+
+                  <listitem>
+                    <para>Specify the database ID (or name)
+                    <literal>[ucpemanager]</literal>:</para>
+                  </listitem>
+
+                  <listitem>
+                    <para>Specify the database server port
+                    <literal>[5432]</literal>:</para>
+                  </listitem>
+
+                  <listitem>
+                    <para>Specify a database user name
+                    <literal>[postgres]</literal>:</para>
+                  </listitem>
+
+                  <listitem>
+                    <para>Specify a database password
+                    <literal>[postgres]</literal>:</para>
+                  </listitem>
+
+                  <listitem>
+                    <para>Specify the database startup thread pool size
+                    <literal>[1]</literal>:</para>
+                  </listitem>
+                </itemizedlist>
+              </listitem>
+
+              <listitem>
+                <para>Service Configurations:</para>
+
+                <itemizedlist spacing="compact">
+                  <listitem>
+                    <para>Specify a service username
+                    <literal>[ucpemanager]:</literal></para>
+                  </listitem>
+
+                  <listitem>
+                    <para>Specify a service password
+                    <literal>[ucpemanager]</literal>:</para>
+                  </listitem>
+                </itemizedlist>
+              </listitem>
+
+              <listitem>
+                <para>High Availability Configurations:</para>
+
+                <itemizedlist spacing="compact">
+                  <listitem>
+                    <para>Specify the IP address of the local interface: The
+                    CentOS 7 Server loopback address:
+                    <literal>127.0.0.1</literal>.</para>
+                  </listitem>
+
+                  <listitem>
+                    <para>Is this server part of a cluster? [Y/N]:
+                    <literal>N</literal>.</para>
+                  </listitem>
+                </itemizedlist>
+              </listitem>
+
+              <listitem>
+                <para>Create the self-signed certificate: <literal>Specify IP or domain name</literal> 
+                  (or press <literal>Enter</literal> to skip):</para>
+
+                  <para>The Tomcat self-signed certificate can be generated
+                  again by running the
+                  <filename>createCertificate.sh</filename>. For more details, please see <olink
+                  targetdoc="book_enea_edge_getting_started"
+                  targetptr="create_certificate">Tomcat Certificate
+                  Generation in the <ns:include
+                  href="../../s_docbuild/olinkdb/pardoc-names.xml"
+                  xpointer="element(book_enea_edge_getting_started/1)"
+                  xmlns:ns="http://www.w3.org/2001/XInclude" /></olink> Manual.</para>
+                
+                <note>
+                  <para>The generation of the Tomcat self-signed cerificate
+                  should be skipped only if another certifcate will be
+                  provided.</para>
+                </note>
+              </listitem>
+
+              <listitem>
+                <para>Heap Configuration:</para> 
+                
+                <itemizedlist spacing="compact">
+                    <listitem>
+                      <para>Please enter the new Maximum Heap Size
+                      [4g]:</para>
+                    </listitem>
+                  </itemizedlist>
+              </listitem>
+            </itemizedlist>
+
+            <para>This command will:</para>
+
+            <itemizedlist spacing="compact">
+              <listitem>
+                <para>Extract the application files from the compressed
+                installation kit.</para>
+              </listitem>
+
+              <listitem>
+                <para>Install the bundled database.</para>
+              </listitem>
+
+              <listitem>
+                <para>Install the Enea Edge Management application as a
+                service with the name <literal>ucpemanager</literal>.</para>
+              </listitem>
+
+              <listitem>
+                <para>Start the <literal>ucpemanager</literal> service.</para>
+              </listitem>
+            </itemizedlist>
+          </listitem>
+
+          <listitem>
+            <para>Using the IPv4 address of the CentOS 7 Server in a web
+            browser, running on the laptop, log into the Enea Edge Management
+            GUI using the default username and password:
+            <literal>admin/admin</literal>.</para>
+          </listitem>
+        </orderedlist>
+
+        <note>
+          <para>The IPv4 address of the CentOS 7 Server will be used as a configuration
+          parameter when setting up the uCPE devices.</para>
+
+          <para>If the CentOS 7 Server is installed behind NAT, the IPv4
+          address used will be the public IP of the NAT device and port
+          forwarding rules must be created to ensure the uCPE device can
+          access the Enea Edge Management application. For more details,
+          please see <link linkend="firewall_config">Firewall
+          Configuration</link>.</para>
+        </note>
+      </section>
+
+      <section id="install_ucpemg_from_backup">
+        <title>Installation of the Enea Edge Management application using a
+        System Back-up</title>
+
+        <para>The Enea Edge Management application can be restored if a backup
+        file has been previously created.</para>
+
+        <para>A backup file can be created by accessing the <emphasis
+        role="bold">System</emphasis> menu, and clicking <emphasis
+        role="bold">System Backup</emphasis>, from the Enea Edge Management
+        GUI. The resulting zip archive will be located in the
+        <filename>/opt/ems/ucpemanager/application/backup</filename> folder
+        and will be named
+        <literal>SystemBackup_MMMDD_YYYY_HHMM_SS.zip</literal> (e.g
+        System-Backup_Feb19_2013_2257_42.zip). Save the archive to another
+        location outside the Enea Edge Management installation folder for
+        future use.</para>
+
+        <note>
+          <para>The System Back-up file obtained from the Enea Edge Management
+          GUI (<filename>SystemBackup_MMMDD_YYYY_HHMM_SS.zip</filename>) is
+          different from the snapshot obtained during an Enea Edge Management
+          Upgrade or Uninstall operation
+          (<filename>ucpemanager-Backup-YYYYddMMHHmm.tar.gz</filename>) needed
+          for recovery of the Enea Edge Management application. For more
+          details, see <olink targetdoc="book_enea_edge_getting_started"
+          targetptr="restore_prev_ucpe_install">Restoring a previous Enea Edge
+          Management installation in the <xi:include
+          href="../../s_docbuild/olinkdb/pardoc-names.xml"
+          xmlns:xi="http://www.w3.org/2001/XInclude"
+          xpointer="element(book_enea_edge_getting_started/1)" /></olink>
+          Manual.</para>
+        </note>
+
+        <para>To install the Enea Edge Management application with the restore
+        option provide an additional argument as shown below during
+        installation:</para>
+
+        <programlisting>./install.sh \
+/opt/ems Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz \
+SystemBackup_MMMDD_YYYY_HHMM_SS.zip</programlisting>
+      </section>
+    </section>
+
+    <section id="prep_usb_ena">
+      <title>Preparing the USB stick for installation of the Enea Edge
+      Runtime</title>
+
+      <para>To install the Enea Edge Runtime, create a bootable USB stick with
+      the image you intend to install.</para>
+
+      <para>In the example below, step by step instructions are provided for
+      the CentOS 7 distribution. It's possible with the appropriate tools to
+      also use Windows OS or MacOS.</para>
+
+      <note>
+        <para>The <filename>.hddimg</filename> image is available in the
+        <filename>Enea_Edge_Runtime_&lt;processor&gt;_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename>
+        file you downloaded with your release.</para>
+      </note>
+
+      <para><emphasis role="bold">Create a bootable USB stick
+      image</emphasis></para>
+
+      <orderedlist>
+        <listitem>
+          <para>Copy the <filename>.hddimg</filename> image file provided by
+          Enea, onto the CentOS 7 server.</para>
+        </listitem>
+
+        <listitem>
+          <para>Connect the USB stick to the CentOS 7 Server and identify the
+          USB device name given by the system with
+          <literal>lsblk</literal>:</para>
+
+          <programlisting>NAME    MAJ:MIN  RM   SIZE    RO  TYPE   MOUNTPOINT
+sda       8:0    1    28.7G   0   disk
+sdb       8:0    0    111.8G  0   disk
+|-sdb1    8:1    0    111.8G  0   part</programlisting>
+        </listitem>
+
+        <listitem>
+          <para>Copy the <filename>.hddimg</filename> image onto the USB
+          stick, e.g:</para>
+
+          <programlisting>sudo dd if=./enea-nfv-access-&lt;machine&gt;.hddimg \
+of=/dev/sdb bs=4M conv=fsync</programlisting>
+
+          <para>Where <filename>enea-nfv-access-&lt;machine&gt;.hddimg</filename> is
+          the <filename>.hddimg</filename> file and <literal>sdb</literal> is
+          the assigned USB device name.</para>
+        </listitem>
+      </orderedlist>
+    </section>
+
+    <section id="prep_phys_deploy">
+      <title>Preparing Physical Deployment for Installation</title>
+
+      <figure>
+        <title>Preparing for Hardware Installation</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata contentwidth="600" fileref="images/prep_deploy.png" />
+          </imageobject>
+        </mediaobject>
+      </figure>
+
+      <para>While the uCPE device is powered off, in order to install and
+      configure the Enea Edge Runtime (using the prepared USB stick), connect
+      the laptop to a uCPE device LAN port. For this purpose, a Layer 2 switch
+      or direct cable connection can be used.</para>
+    </section>
+
+    <section id="install_ena_device">
+      <title>Installing Enea Edge - uCPE Device Installation</title>
+
+      <para>To initiate the installation of the Enea Edge Runtime do the
+      following:</para>
+
+      <orderedlist>
+        <listitem>
+          <para>Plug the USB stick into the uCPE device.</para>
+        </listitem>
+
+        <listitem>
+          <para>Power up the uCPE device and boot the USB stick.</para>
+        </listitem>
+
+        <listitem>
+          <para>The Web-installer application will start automatically and can
+          be accessed in a web browser on the laptop at
+          <literal>http://172.16.1.1</literal> (port 80).</para>
+        </listitem>
+
+        <listitem>
+          <para>On the <emphasis role="bold">Requirements</emphasis> page of
+          the Web-installer, the user must confirm the the current state of
+          the installation prerequisites is inline with the desired
+          state:</para>
+
+          <itemizedlist>
+            <listitem>
+              <para>Requirements table. Minimum values apply to the
+              installation process only. For runtime operations, additional
+              resources should be available depending on the specific
+              workload. Requirements are color coded (green when met, red when
+              mandatory and not met, orange when optional and not met). The
+              Requirements table has the following fields:</para>
+
+              <itemizedlist spacing="compact">
+                <listitem>
+                  <para>Disk size (mandatory). 2GB or more are required for
+                  the installation.</para>
+                </listitem>
+
+                <listitem>
+                  <para>CPU cores (mandatory). 2 cores or more are required
+                  for the installation.</para>
+                </listitem>
+
+                <listitem>
+                  <para>RAM (mandatory). 2GB or more are required for the
+                  installation.</para>
+                </listitem>
+
+                <listitem>
+                  <para>VT-x (mandatory). Intel Virtualization Technology must
+                  be enabled.</para>
+                </listitem>
+
+                <listitem>
+                  <para>VT-d (optional, recommended). Intel Virtualization
+                  Technology for Directed I/O should be enabled.</para>
+                </listitem>
+
+                <listitem>
+                  <para>IOMMU Group separation (optional). If the hardware
+                  does not support IOMMU Group separation, there are certain
+                  limitations regarding how the <literal>vfio-pci</literal>
+                  driver can be used. For more details, see the <olink
+                  targetdoc="book_enea_edge_release_info"
+                  targetptr="bugs-limitations">Known Issues and Limitations in
+                  this Release in the <xi:include
+                  href="../../s_docbuild/olinkdb/pardoc-names.xml"
+                  xmlns:xi="http://www.w3.org/2001/XInclude"
+                  xpointer="element(book_enea_edge_release_info/1)" /></olink>
+                  Manual.</para>
+                </listitem>
+              </itemizedlist>
+            </listitem>
+
+            <listitem>
+              <para>Force installation checkbox. When enabled, the
+              installation can be performed even if some of the mandatory
+              requirements are not met or if non-fatal problems are detected
+              during the process.</para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+
+        <listitem>
+          <para>On the Enea <emphasis role="bold">Edge Management
+          settings</emphasis> page of the Web-installer, the user must fill
+          in:</para>
+
+          <itemizedlist>
+            <listitem>
+              <para>The static Enea Edge Management IP Address or FQDN. This
+              can be either:</para>
+
+              <itemizedlist spacing="compact">
+                <listitem>
+                  <para>The IP address of the Enea Edge Management host
+                  machine, if the device can directly access it.</para>
+                </listitem>
+
+                <listitem>
+                  <para>The IP address of the NAT device, if the Enea Edge
+                  Management host is located behind a NAT. For more details,
+                  please see <link linkend="firewall_config">Firewall
+                  Configuration</link>.</para>
+                </listitem>
+
+                <listitem>
+                  <para>The Fully Qualified Domain Name (FQDN) of the Enea
+                  Edge Management host machine.</para>
+                </listitem>
+              </itemizedlist>
+            </listitem>
+
+            <listitem>
+              <para>The unique identifier of the uCPE device (called
+              "DeviceId" in this Manual).</para>
+            </listitem>
+
+            <listitem>
+              <para>Customer Tags. They are used for Zero Touch Provisioning
+              (ZTP) and can be left empty for a base configuration. What can
+              be entered here (if needed), are the tag(s) specified when
+              creating an offline configuration in the Enea Edge Management
+              application. A later addition of customer tags can only be done
+              by reinstalling the uCPE devices.</para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+
+        <listitem>
+          <para>Connect the WAN cable to the uCPE device (see Figure 2). This
+          will be used as the uCPE management network interface, as described
+          below.</para>
+        </listitem>
+
+        <listitem>
+          <para>On the <emphasis role="bold">Network Setup</emphasis> page of
+          the Web-installer, the user must do the following:</para>
+
+          <itemizedlist>
+            <listitem>
+              <para>Select a WAN interface to use as the management network
+              interface. This interface is used by the Enea Edge Management
+              application to communicate with the uCPE device.</para>
+            </listitem>
+
+            <listitem>
+              <para>Plug-in additional WAN interfaces (if applicable) and
+              provide their Layer 3 configuration.</para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+      </orderedlist>
+
+      <para>When the user has completed the configuration steps in the
+      Web-installer, Enea Edge Runtime is installed on the hard drive. At this
+      stage, the user should remove the USB stick and the LAN cable, and
+      shutdown the uCPE device. It will be started after necessary
+      configurations are done in the Enea Edge Management application, as
+      described below.</para>
+
+      <note>
+        <para>If errors are detected during installation, full logs will be
+        available on the last page of the Web-installer. Please contact Enea
+        for log analysis. The system is not expected to be usable if errors
+        are reported during installation.</para>
+
+        <para>If the USB stick was booted in UEFI mode, a UEFI boot entry is
+        automatically created and the system will start booting from the hard
+        drive without further user configuration.</para>
+      </note>
+    </section>
+
+    <section id="prep_phys_exec">
+      <title>Preparing Physical Deployment for Execution</title>
+
+      <figure>
+        <title>Preparing for Deployment Execution</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata contentwidth="600" fileref="images/prep_execution.png" />
+          </imageobject>
+        </mediaobject>
+      </figure>
+
+      <para>The following network configuration is needed for managing the
+      uCPE device and service deployment:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>Network connection between the server running the Enea Edge
+          Management application and the laptop.</para>
+        </listitem>
+
+        <listitem>
+          <para>Network connection between the server running the Enea Edge
+          Management application and the uCPE device.</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+  </section>
+
+  <section id="mg_ucpe_devices">
+    <title>Management of uCPE Devices</title>
+
+    <para>When the installation is complete the uCPE device can be managed in
+    the Enea Edge Management application.</para>
+
+    <section id="add_offline_config">
+      <title>Add a default Offline Configuration</title>
+
+      <para>Zero Touch Provisioning is always turned on when a uCPE device
+      connects to the Enea Edge Management application. To enable it in the
+      Enea Edge Management application, an offline configuration needs to be
+      registered for Day-0 configuration.</para>
+
+      <note>
+        <para>Day-0 configuration is a software lifecycle term referring to
+        early configurations used to put the uCPE device in an active state.
+        Day-1 Configurations are applied after Day-0 and set the uCPE device
+        and its service in an active state. Day-2 Configurations are live
+        configurations on the uCPE device and its service, applied after they
+        have been activated.</para>
+      </note>
+
+      <para>The offline configuration consists of data and parameters that are
+      meant to be automatically set when a uCPE device connects to the Enea
+      Edge Management application for the first time. The configuration is
+      typically focused on setting up the network management of the uCPE
+      device, e.g. configuring network interfaces, WAN and LAN networking and
+      service chains.</para>
+
+      <para>For this base configuration, the offline configuration will be
+      left blank. The blank offline configuration can be filled with
+      user-specific values and data once the service is created, which is done
+      after the installation is complete.</para>
+
+      <note>
+        <para>If the offline configuration is not configured, an alarm will be
+        raised: <literal>Day-0 Config:ZTP:Major</literal> when the uCPE device
+        tries to connect to the Enea Edge Management application, informing
+        the user that the ZTP setup failed for the uCPE device.</para>
+      </note>
+
+      <para><emphasis role="bold">Creating an offline
+      configuration</emphasis></para>
+
+      <orderedlist>
+        <listitem>
+          <para>In a browser, access the Enea Edge Management application,
+          open <emphasis role="bold">Applications</emphasis> and select
+          <emphasis role="bold">Offline Config</emphasis>.</para>
+        </listitem>
+
+        <listitem>
+          <para>Create a new offline configuration in the GUI by selecting the
+          <emphasis role="bold">Add</emphasis> button and filling in the
+          mandatory fields: <literal>name</literal>,
+          <literal>deviceVersion</literal> and
+          <literal>deviceId</literal>.</para>
+
+          <para>The name is user defined and can be set to any unique text
+          string identifying the configuration. The
+          <literal>deviceVersion</literal> must match the Enea Edge Runtime
+          version of the uCPE device and the <literal>deviceId</literal> must
+          be the previously set identifier of the uCPE device
+          (DeviceId).</para>
+        </listitem>
+      </orderedlist>
+    </section>
+
+    <section id="add_ucpe_mg">
+      <title>Add a uCPE device to the Management System</title>
+
+      <para>In order to enroll a uCPE device in the management system and
+      establish a management connection, the user will add uCPE device
+      information in the Enea Edge Management application. This is
+      accomplished by going to <emphasis role="bold">Devices</emphasis>,
+      selecting <emphasis role="bold">Manage</emphasis> and then clicking the
+      <emphasis role="bold">Add</emphasis> button.</para>
+
+      <para>The relevant parameters are:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Type.</emphasis> The type of device to
+          be added, i.e Enea universal CPE.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Name.</emphasis> The name by which the
+          uCPE device is referred to in the Enea Edge Management application.
+          (Mandatory).</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">SSH Port.</emphasis> The NETCONF Port
+          used for communications. Default is set to 830.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">SSH User Name.</emphasis> The user name
+          for SSH connectivity. Default user is root.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">SSH Password.</emphasis> Leave this
+          blank.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Device Calls Home.</emphasis> This
+          checkbox indicates the direction of uCPE device communications. For
+          a base configuration, leave this flag unchecked.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Device ID.</emphasis> The unique
+          identifier of the uCPE device. (Mandatory).</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>For more details concerning Device Calls Home, please see <olink
+      targetdoc="book_enea_edge_getting_started"
+      targetptr="device_callhome_nat">Device Call Home Connection for
+      Deployment behind NAT in the <xi:include
+      href="../../s_docbuild/olinkdb/pardoc-names.xml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xpointer="element(book_enea_edge_getting_started/1)" /></olink>
+      Manual.</para>
+    </section>
+
+    <section id="boot_device_add_map">
+      <title>Booting the uCPE device and adding it to the Map</title>
+
+      <para>When connectivity is established with the Enea Edge Management
+      application and a uCPE device is already registered with a matching
+      <literal>Device ID</literal>, the installation is complete, and the
+      connection is established.</para>
+
+      <para>When a uCPE device is registered it can be manually added to the
+      map for overview. <emphasis role="bold">Right-click</emphasis> on the
+      map and select <emphasis role="bold">Place Device</emphasis> to put the
+      uCPE device on the map.</para>
+
+      <para>In case of management connection failure (e.g. due to a
+      misconfiguration), the uCPE device status will be seen as RED
+      (disconnected) in the Enea Edge Management application. The uCPE device
+      configuration can be corrected by removing the WAN cable(s),
+      reconnecting the laptop to the LAN interface of the uCPE device and
+      rebooting it. At this point, the Web-installer can be accessed from the
+      laptop as described in <olink targetdoc="book_enea_edge_getting_started"
+      targetptr="install_ena_device">Installing Enea Edge - uCPE Device
+      installation in the <xi:include
+      href="../../s_docbuild/olinkdb/pardoc-names.xml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xpointer="element(book_enea_edge_getting_started/1)" /></olink>
+      Manual.</para>
+    </section>
+  </section>
+
+  <section id="ucpe_monitor">
+    <title>uCPE Device Monitorization and Control</title>
+
+    <para>Once the uCPE device is connected to the Enea Edge Management
+    application, it is ready for central management. Two important functions
+    available in the Enea Edge Management GUI are alarm checking and resource
+    allocation. Additionally, the device can be rebooted, the factory settings
+    can be restored or simply the vCPE service can be restarted.</para>
+
+    <section id="check_alarms">
+      <title>Checking Alarms</title>
+
+      <para>The Enea Edge Management application dashboard presents alarms in
+      a specific window on the front page.</para>
+
+      <para>An alarm can be easily triggered by disconnecting and reconnecting
+      the WAN ethernet cable from the uCPE device. The management system will
+      detect the broken link and raise an alarm: <literal>Device
+      Disconnected::Critical</literal>.</para>
+
+      <para>A separate Alarm Management window can be accessed from the Enea
+      Edge Management menu for in-depth access and programming of <emphasis
+      role="bold">Alarms and Events</emphasis>.</para>
+    </section>
+
+    <section id="ck_resource_alloc">
+      <title>Checking uCPE device Resource Allocation</title>
+
+      <para>When the uCPE device is connected to the Enea Edge Management
+      application it is of interest to check the amount of hardware resources
+      in use.</para>
+
+      <para>To check CPU, RAM and disk utilization simply select the uCPE
+      device and go to the <emphasis role="bold">Virtual Machines</emphasis>
+      tab in the map view. The same view will show active VNFs running on the
+      uCPE device once instantiated.</para>
+    </section>
+
+    <section id="basic_oper_device">
+      <title>Basic operations for uCPE device Managememt</title>
+
+      <para>When the uCPE device is connected to the Enea Edge Management
+      application, it can be rebooted, the factory settings can be restored or
+      simply the vCPE service can be restarted.</para>
+
+      <para>Select the uCPE device and go to the <emphasis
+      role="bold">Operations</emphasis> menu, where the following options are
+      available:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Reboot</emphasis>. Reboots the device.
+          Settings will be preserved.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Factory reset</emphasis>. Resets the
+          device to its default factory settings. All current configuration
+          settings are lost. All running VNFs are destroyed. Any installed
+          custom scripts will be removed and they will need to be
+          reinstalled.</para>
+
+          <para>Only the vCPE service will be restarted, the device will not
+          be rebooted. No reboot is needed.</para>
+
+          <para>Once the vCPE service restart completes, appropriate day-0
+          provisioning will take place.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Restart Vcpe</emphasis>. Restarts the
+          vCPE service on the device. The device will not be rebooted.</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+
+    <section id="access_device_cli">
+      <title>Accessing the uCPE device CLI</title>
+
+      <para>As a final check to make sure the uCPE device was installed and
+      configured correctly, access the uCPE device Linux CLI by selecting the
+      uCPE device on the map and using the <emphasis role="bold">SSH
+      button</emphasis> from the panel. A new window will appear for CLI
+      access. The default user and password are <literal>root</literal> and
+      blank, respectively.</para>
+
+      <para>This is a pure Linux CLI providing access to standard Linux CLI
+      commands. The CLI is a central feature for running custom
+      scripting.</para>
+
+      <note>
+        <para>In case the uCPE device was installed behind a NAT device, the
+        reverse SSH connection will be used. For more details, please see
+        <olink targetdoc="book_enea_edge_getting_started"
+        targetptr="device_callhome_nat">Device Call Home Connection for
+        deployment behind NAT in the <xi:include
+        href="../../s_docbuild/olinkdb/pardoc-names.xml"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_edge_getting_started/1)" /></olink>
+        Manual.</para>
+      </note>
+    </section>
+  </section>
+</chapter>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/introduction.xml b/doc/book-enea-edge-getting-started/doc/introduction.xml
index 5f8a5ad..eaa5521 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/introduction.xml
+++ b/doc/book-enea-edge-getting-started/doc/introduction.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <chapter id="intro_ucpe">
   <title>Overview</title>
 
-  <para>This document describes the Enea NFV Access and provides installation
-  steps for deploying a base configuration in order to create:</para>
+  <para>This document describes Enea Edge and provides installation steps for
+  deploying a base configuration in order to create:</para>
 
   <itemizedlist>
     <listitem>
-      <para>A functional uCPE Management installation ready to manage uCPE
-      devices.</para>
+      <para>A functional Enea Edge Management installation ready to manage
+      uCPE devices.</para>
     </listitem>
 
     <listitem>
@@ -23,52 +23,51 @@
   following chapters.</para>
 
   <section id="ena_solution">
-    <title>Enea NFV Access</title>
+    <title>Enea Edge</title>
 
-    <para>Enea NFV Access for universal Customer Premise Equipment (uCPE) is a
+    <para>Enea Edge for universal Customer Premise Equipment (uCPE) is a
     virtualization and management platform, which allows end-users to onboard,
     instantiate, and run third-party VNFs onto their systems. It is comprised
     of two major components working in close cooperation:</para>
 
     <itemizedlist>
       <listitem>
-        <para>The Enea NFV Access Runtime Platform, which acts as the host
-        for Virtualized Network Functions (VNFs) and provides management over
-        NETCONF.</para>
+        <para>Enea Edge Runtime, which acts as the host for Virtualized
+        Network Functions (VNFs) and provides management over NETCONF.</para>
       </listitem>
 
       <listitem>
-        <para>The Enea uCPE Manager, a solution that runs on an external
+        <para>Enea Edge Management, an application that runs on an external
         server, used for VNF Management and managing large numbers of uCPE
         devices.</para>
       </listitem>
     </itemizedlist>
 
-    <para>In addition, Enea NFV Access also includes a software framework for
-    Automation and Testing (AFTH). More information can be found in
-    <xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+    <para>In addition, Enea Edge includes a framework for automation and
+    testing. More information can be found in the <xi:include
+    href="../../s_docbuild/olinkdb/pardoc-common.xml"
     xmlns:xi="http://www.w3.org/2001/XInclude"
-    xpointer="element(book_enea_nfv_access_auto_fw_th_user_guide/1)" />.</para>
+    xpointer="element(book_enea_edge_automation_user_guide/1)" />.</para>
 
     <para>Details concerning release content, including documentation
     structure, are provided in the <xi:include
     href="../../s_docbuild/olinkdb/pardoc-common.xml"
     xmlns:xi="http://www.w3.org/2001/XInclude"
-    xpointer="element(book_enea_nfv_access_release_info/1)" /> manual included
+    xpointer="element(book_enea_edge_release_info/1)" /> Manual included
     with your release.</para>
 
     <section id="nfv_access">
-      <title>Enea NFV Access Runtime Platform</title>
+      <title>Enea Edge Runtime</title>
 
-      <para>Enea NFV Access Runtime Platform is a lightweight,
-      multi-architecture virtualization platform built on de-facto standards
-      in an SDN/NFV ecosystem. It is designed for a high networking
-      performance with minimal hardware footprint, by only providing relevant
-      functionalties and technologies.</para>
+      <para>Enea Edge Runtime is a lightweight, multi-architecture
+      virtualization platform built on de-facto standards in an SDN/NFV
+      ecosystem. It is designed for a high networking performance with minimal
+      hardware footprint, by only providing relevant functionalties and
+      technologies.</para>
 
       <para>Virtualization methods include Virtual Machines (KVM / QEMU) and
       container(s) (Docker). High networking throughput and low latency are
-      ensured by accelerated data plane relying on technologies like DPDK,
+      ensured by an accelerated data plane relying on technologies like DPDK,
       OVS-DPDK and SR-IOV/PCI-Passthrough. Key functionalities, such as
       platform software management, virtualized networking, VNFs life-cycle
       management and FCAPS are provided through the YANG-modelled NETCONF
@@ -87,19 +86,20 @@
     </section>
 
     <section id="ucpe_manager">
-      <title>Enea uCPE Manager</title>
+      <title>Enea Edge Management</title>
 
-      <para>The Enea uCPE Manager is centralized control system providing
-      uCPEs domain management capabilities through a GUI and REST API. It can
+      <para>The Enea Edge Management application is a centralized control system providing
+      domain management capabilities to uCPEs through a GUI and REST API. It can
       be deployed on a host or a virtual machine running 64-bit CentOS 7 on an
-      x86 platform. The Enea uCPE Manager uses a southbound NETCONF protocol
-      to connect and manage uCPE devices.</para>
+      x86 platform. The Enea Edge Management application uses a southbound NETCONF
+      protocol to connect and manage uCPE devices.</para>
 
-      <para>The Enea uCPE Manager provides the following key features:</para>
+      <para>The Enea Edge Management application provides the following key
+      features:</para>
 
       <itemizedlist>
         <listitem>
-          <para>Enea NFV Access Runtime Platform Software Management</para>
+          <para>Enea Edge Runtime Software Management</para>
         </listitem>
 
         <listitem>
@@ -141,31 +141,30 @@
 
           <tbody>
             <row>
-              <entry>Enea NFV Access</entry>
+              <entry>Enea Edge</entry>
 
-              <entry>The Enea NFV Access Runtime Platform and the Enea uCPE
-              Manager.</entry>
+              <entry>The Enea Edge Runtime and Enea Edge
+              Management solutions.</entry>
             </row>
 
             <row>
-              <entry>Enea NFV Access Runtime Platform</entry>
+              <entry>Enea Edge Runtime</entry>
 
               <entry>A lightweight, multi-architecture virtualization
               platform, supporting Virtual Machines.</entry>
             </row>
 
             <row>
-              <entry>Enea uCPE Manager</entry>
+              <entry>Enea Edge Management</entry>
 
-              <entry>Enea Universal Customer Premises Equipment
+              <entry>The Enea Universal Customer Premises Equipment
               Manager.</entry>
             </row>
 
             <row>
               <entry>uCPE device</entry>
 
-              <entry>A whitebox running the Enea NFV Access Runtime
-              Platform.</entry>
+              <entry>A whitebox running the Enea Edge Runtime.</entry>
             </row>
           </tbody>
         </tgroup>
@@ -256,6 +255,12 @@
 
               <entry>Virtual Network Function.</entry>
             </row>
+
+            <row>
+              <entry>vCPE</entry>
+
+              <entry>Virtual Customer Premises Equipment.</entry>
+            </row>
           </tbody>
         </tgroup>
       </table>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/log_collector.xml b/doc/book-enea-edge-getting-started/doc/log_collector.xml
index 8b8be31..1148dc2 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/log_collector.xml
+++ b/doc/book-enea-edge-getting-started/doc/log_collector.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="log_collector">
   <title>Using the Log Collector</title>
 
-  <para>Troubleshooting problems on the uCPE device require an analysis of a
-  set of information i.e. logs collected from the uCPE device and/or Enea uCPE
-  Manager. The following describe how the log collection mechanism
-  works.</para>
+  <para>Troubleshooting problems on a uCPE device require an analysis of a set
+  of data and information i.e. logs collected from the uCPE device and/or the
+  Enea Edge Management application. The following information describes how
+  the log collection mechanism works.</para>
 
   <section id="log_collect_ucpem">
-    <title>Log collecting using the Enea uCPE Manager</title>
+    <title>Log collecting using the Enea Edge Management application</title>
 
-    <para>The Enea uCPE Manager allows for collecting a set of logs and state
-    information from a uCPE device.</para>
+    <para>The Enea Edge Management application allows for collecting a set of
+    logs and state information from a uCPE device.</para>
 
     <section id="log_collect">
       <title>Collecting the Logs</title>
@@ -22,8 +22,8 @@
 
       <orderedlist>
         <listitem>
-          <para>Access <literal>Operations</literal> -&gt; <literal>Collect
-          Debug Logs</literal>.</para>
+          <para>Access <emphasis role="bold">Operations</emphasis> and then
+          select <emphasis role="bold">Collect Debug Logs</emphasis>.</para>
         </listitem>
 
         <listitem>
@@ -31,7 +31,8 @@
         </listitem>
 
         <listitem>
-          <para>Press the <literal>Execute</literal> button.</para>
+          <para>Press the <emphasis role="bold">Execute</emphasis>
+          button.</para>
 
           <para>A success message is shown in the same window as shown below.
           At this moment, the process of collecting logs on the uCPE device
@@ -53,9 +54,9 @@
       <note>
         <para>It might take some time for the archive to be created. When the
         operation completes, a "CollectLogsComplete" notification is sent from
-        the uCPE device to the Enea uCPE Manager. This can be viewed in the
-        GUI under the <literal>Faults</literal> -&gt;
-        <literal>Events</literal> toolbar menu.</para>
+        the uCPE device to the Enea Edge Management application. This can be
+        viewed in the GUI in the <emphasis role="bold">Faults</emphasis> menu,
+        after selecting <emphasis role="bold">Events</emphasis>.</para>
 
         <figure>
           <title>Collecting Debug Logs</title>
@@ -74,16 +75,17 @@
       <title>View collected Logs</title>
 
       <para>A list with the archives containing already collected logs will be
-      shown in the <literal>Device File Listing</literal> table:</para>
+      shown in the <emphasis role="bold">Device File Listing</emphasis>
+      table:</para>
 
       <orderedlist>
         <listitem>
-          <para>Access <literal>Files</literal> -&gt;
-          <literal>Download</literal>.</para>
+          <para>Access the <emphasis role="bold">Files</emphasis> menu and
+          select the <emphasis role="bold">Download</emphasis> button.</para>
         </listitem>
 
         <listitem>
-          <para>Press the <literal>List</literal> button.</para>
+          <para>Press the <emphasis role="bold">List</emphasis> button.</para>
 
           <figure>
             <title>Device File Listing Table</title>
@@ -100,9 +102,9 @@
 
       <note>
         <para>If the filename you specified does not appear, it might still be
-        in the process of creation. Click on the <literal>Refresh</literal>
-        icon at the bottom of the table until you can see the desired file
-        listing.</para>
+        in the process of creation. Click on the <emphasis
+        role="bold">Refresh</emphasis> icon at the bottom of the table until
+        you can see the desired file listing.</para>
       </note>
     </section>
 
@@ -110,30 +112,30 @@
       <title>Downloading Logs from the uCPE Device</title>
 
       <para>This option transfers a debug file archive from the uCPE device to
-      Enea uCPE Manager.</para>
+      Enea Edge Management application.</para>
 
       <orderedlist>
         <listitem>
-          <para>Access <literal>Files</literal> -&gt;
-          <literal>Download</literal>.</para>
+          <para>Access the <emphasis role="bold">Files</emphasis> menu and
+          select the <emphasis role="bold">Download</emphasis> button.</para>
         </listitem>
 
         <listitem>
-          <para>Press the <literal>List</literal> button.</para>
+          <para>Press the <emphasis role="bold">List</emphasis> button.</para>
         </listitem>
 
         <listitem>
-          <para>In the <literal>Device File Listing</literal> table, select
-          the archive you want to download from the uCPE device to Enea uCPE
-          Manager.</para>
+          <para>In the <emphasis role="bold">Device File Listing</emphasis>
+          table, select the archive you want to download from the uCPE device
+          to Enea Edge Management.</para>
         </listitem>
 
         <listitem>
-          <para>Press the <literal>Download from Device</literal>
-          button.</para>
+          <para>Press the <emphasis role="bold">Download from
+          Device</emphasis> button.</para>
 
           <para>The archive will be downloaded from the uCPE device and stored
-          on the Enea uCPE Manager.</para>
+          on the Enea Edge Management application.</para>
         </listitem>
       </orderedlist>
 
@@ -146,30 +148,33 @@
     <section id="download_logs_locally">
       <title>Downloading collected Logs locally</title>
 
-      <para>This option downloads a logs archive from the Enea uCPE Manager to
-      a local (user) machine for analysis. The archive must first be available
-      in the Enea uCPE Manager in order to be downloaded.</para>
+      <para>This option downloads a logs archive from the Enea Edge Management
+      application to a local (user) machine for analysis. The archive must
+      first be available in the Enea Edge Management application in order to
+      be downloaded.</para>
 
       <orderedlist>
         <listitem>
-          <para>Access <literal>Devices</literal> -&gt;
-          <literal>Files</literal>.</para>
+          <para>Access the <emphasis role="bold">Devices</emphasis> menu and
+          select <emphasis role="bold">Files</emphasis>.</para>
         </listitem>
 
         <listitem>
-          <para>Select the <literal>Downloaded Files</literal> tab.</para>
+          <para>Select the <emphasis role="bold">Downloaded Files</emphasis>
+          tab.</para>
         </listitem>
 
         <listitem>
-          <para>Select an archive from <literal>Downloaded Files</literal>
-          table.</para>
+          <para>Select an archive from the <emphasis role="bold">Downloaded
+          Files</emphasis> table.</para>
         </listitem>
 
         <listitem>
-          <para>Click the <literal>Download</literal> button.</para>
+          <para>Click the <emphasis role="bold">Download</emphasis>
+          button.</para>
 
-          <para>The file will be downloaded in browser's download
-          folder.</para>
+          <para>The file will be downloaded in the download folder of the
+          supported browser in use.</para>
 
           <figure>
             <title>Downloaded Files Table</title>
@@ -189,25 +194,28 @@
       <title>Deleting a Logs Archive from a uCPE device</title>
 
       <para>Use this option when you want to delete unnecessary collected logs
-      on the uCPE device.</para>
+      on a uCPE device.</para>
 
       <orderedlist>
         <listitem>
-          <para>Access <literal>Files</literal> -&gt;
-          <literal>Download</literal>.</para>
+          <para>Access the <emphasis role="bold">Files</emphasis> menu and
+          then click the <emphasis role="bold">Download</emphasis>
+          button.</para>
         </listitem>
 
         <listitem>
-          <para>Press the <literal>List</literal> button.</para>
+          <para>Press the <emphasis role="bold">List</emphasis> button.</para>
         </listitem>
 
         <listitem>
-          <para>In the <literal>Device File Listing</literal> table, select
-          the archive you want to delete from the uCPE device.</para>
+          <para>In the <emphasis role="bold">Device File Listing</emphasis>
+          table, select the archive you want to delete from the uCPE
+          device.</para>
         </listitem>
 
         <listitem>
-          <para>Press the <literal>Delete</literal> button.</para>
+          <para>Press the <emphasis role="bold">Delete</emphasis>
+          button.</para>
 
           <para>The archive will be deleted from the uCPE device and the table
           will be updated.</para>
@@ -218,8 +226,9 @@
 
       <orderedlist>
         <listitem>
-          <para>Access <literal>Operations</literal> -&gt; <literal>Delete
-          Debug Log Archive</literal>.</para>
+          <para>Access the <emphasis role="bold">Operations</emphasis> menu
+          and select <emphasis role="bold">Delete Debug Log
+          Archive</emphasis>.</para>
         </listitem>
 
         <listitem>
@@ -227,7 +236,8 @@
         </listitem>
 
         <listitem>
-          <para>Press the <literal>Execute</literal> button.</para>
+          <para>Press the <emphasis role="bold">Execute</emphasis>
+          button.</para>
 
           <para>A success message is displayed if the file is deleted from the
           uCPE device correctly.</para>
@@ -236,55 +246,59 @@
     </section>
 
     <section id="delete_archives_ucpem">
-      <title>Deleting a Logs Archive from the Enea uCPE Manager</title>
+      <title>Deleting a Logs Archive from the Enea Edge Management
+      application</title>
 
-      <para>This option deletes a logs archive from the Enea uCPE
-      Manager.</para>
+      <para>This option deletes a logs archive from the Enea Edge Management
+      application.</para>
 
       <orderedlist>
         <listitem>
-          <para>Access <literal>Devices</literal> -&gt;
-          <literal>Files</literal>.</para>
+          <para>Access the <emphasis role="bold">Devices</emphasis> menu, then
+          select <emphasis role="bold">Files</emphasis>.</para>
         </listitem>
 
         <listitem>
-          <para>Select the <literal>Downloaded Files</literal> tab.</para>
+          <para>Select the <emphasis role="bold">Downloaded Files</emphasis>
+          tab.</para>
         </listitem>
 
         <listitem>
-          <para>Select an archive from the <literal>Downloaded Files</literal>
-          table.</para>
+          <para>Select an archive from the <emphasis role="bold">Downloaded
+          Files</emphasis> table.</para>
         </listitem>
 
         <listitem>
-          <para>Click the <literal>Delete</literal> button.</para>
+          <para>Click the <emphasis role="bold">Delete</emphasis>
+          button.</para>
 
-          <para>The file will be deleted from the Enea uCPE Manager and the
-          table will be updated.</para>
+          <para>The file will be deleted from the Enea Edge Management
+          application and the table will be updated.</para>
         </listitem>
       </orderedlist>
 
       <note>
-        <para>Deleting the logs file from the Enea uCPE Manager does not
-        affect the file located on the uCPE device.</para>
+        <para>Deleting the logs file from the Enea Edge Management application
+        does not affect the file located on the uCPE device.</para>
       </note>
     </section>
 
     <section condition="hidden" id="enable_disable_via_perms">
-      <title>Enabling/Disabling of the Log Collector via Permissions</title>
+      <title>Enabling/Disabling the Log Collector via Permissions</title>
 
       <para>To disable the ability to access/download the uCPE device's
-      debug-log files from the Enea uCPE Manager, the appropriate permissions
-      must be changed:</para>
+      debug-log files from the Enea Edge Management application, the
+      appropriate permissions must be changed:</para>
 
       <orderedlist>
         <listitem>
-          <para>Access <literal>Security</literal> -&gt;
-          <literal>Configuration</literal>.</para>
+          <para>Access the <emphasis role="bold">Security</emphasis> menu,
+          then select <emphasis role="bold">Configuration</emphasis>.</para>
         </listitem>
 
         <listitem>
-          <para>Click the <literal>Security Groups</literal> tab.</para>
+          <para>Click the <emphasis role="bold">Security Groups</emphasis>
+          tab.</para>
         </listitem>
 
         <listitem>
@@ -292,18 +306,19 @@
         </listitem>
 
         <listitem>
-          <para>Click the <literal>Permissions</literal> tab on the right
-          side.</para>
+          <para>Click the <emphasis role="bold">Permissions</emphasis> tab on
+          the right side.</para>
         </listitem>
 
         <listitem>
-          <para>Click the <literal>Devices</literal> tab like in the image
-          below.</para>
+          <para>Click the <emphasis role="bold">Devices</emphasis> tab like in
+          the image below.</para>
         </listitem>
 
         <listitem>
-          <para>Change the <literal>Device File Management</literal> option to
-          <literal>none</literal> to disable the feature.</para>
+          <para>Change the <emphasis role="bold">Device File
+          Management</emphasis> option to <emphasis
+          role="bold">none</emphasis> to disable the feature.</para>
         </listitem>
       </orderedlist>
 
@@ -320,32 +335,32 @@
     </section>
 
     <section id="download_ucpemg_logs">
-      <title>Downloading Enea uCPE Manager Logs</title>
+      <title>Downloading Enea Edge Management Logs</title>
 
-      <para>Often, sending the Enea uCPE Manager logs together with collected
-      uCPE device logs to the support team provides important information for
-      troubleshooting (especially in cases of connectivity issues with the
-      uCPE device and error popups).</para>
+      <para>Often, sending the Enea Edge Management logs together with
+      collected uCPE device logs to the support team provides important
+      information for troubleshooting (especially in cases of connectivity
+      issues with the uCPE device and error popups).</para>
 
-      <para>Enea uCPE Manager log files are located in
-      <filename>application/logs/</filename> in the Enea uCPE Manager's
-      installation folder
+      <para>Enea Edge Management log files are located in
+      <filename>application/logs/</filename> in the Enea Edge Management
+      application's installation folder
       (e.g.<filename>/opt/ems/ucpemanager/application/logs</filename>). They
       can be copied from that location, or they can be downloaded using the
-      Enea uCPE Manager GUI by performing the following:</para>
+      Enea Edge Management GUI by performing the following:</para>
 
       <orderedlist>
         <listitem>
-          <para>Access <literal>Test</literal> -&gt; <literal>Debug
-          Settings</literal> and select the <literal>Log Files</literal>
-          tab.</para>
+          <para>Access <emphasis role="bold">Test</emphasis>, then <emphasis
+          role="bold">Debug Settings</emphasis> and select the <emphasis
+          role="bold">Log Files</emphasis> tab.</para>
         </listitem>
 
         <listitem>
           <para>Select the desired log file
           (<filename>ucpemanager.log</filename> or
-          <filename>watchdog.log</filename>) and press the
-          <literal>Download</literal> button.</para>
+          <filename>watchdog.log</filename>) and press the <emphasis
+          role="bold">Download</emphasis> button.</para>
         </listitem>
 
         <listitem>
@@ -373,12 +388,13 @@
   </section>
 
   <section id="log_collect_no_ucpem">
-    <title>Log collecting without using the Enea uCPE Manager</title>
+    <title>Log collecting without using the Enea Edge Management
+    application</title>
 
     <para>Log collection from uCPE Devices can also be done when there is no
-    Enea uCPE Manager connection. A SSH connection to uCPE Device is needed
-    for use of the log collector script, which can be found in the uCPE Device
-    file system in <literal>/usr/local/enea/</literal>.</para>
+    Enea Edge Management connection. A SSH connection to the uCPE Device is
+    needed for use of the log collector script, which can be found in the uCPE
+    Device file system in <literal>/usr/local/enea/</literal>.</para>
 
     <para>The Log collector script takes relevant information about the system
     and collects it in an archive:</para>
@@ -386,7 +402,7 @@
     <programlisting>./log-collector.sh -p &lt;LOG_PATHh&gt; -n &lt;ARCHIVE_NAME&gt;</programlisting>
 
     <para>Where <literal>-p</literal> is the path where the log archive will
-    be saved, <literal>-n</literal> is the archive name.</para>
+    be saved, and <literal>-n</literal> is the archive name.</para>
 
     <note>
       <para>If <literal>-p</literal> is not provided, the default path will be
diff --git a/doc/book-enea-nfv-access-getting-started/doc/net_config_options.xml b/doc/book-enea-edge-getting-started/doc/net_config_options.xml
index 1d51537..ff513c9 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/net_config_options.xml
+++ b/doc/book-enea-edge-getting-started/doc/net_config_options.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="net_config_operations">
   <title>Network Configuration Options</title>
 
-  <para>Various Advanced Network Configuration options can be done from Enea
-  uCPE Manager GUI.</para>
+  <para>Various Advanced Network Configuration options can be done from the
+  Enea Edge Management application GUI.</para>
 
   <section id="device_callhome_nat">
     <title>Device Call Home Connection for Deployment behind NAT</title>
 
     <para>The Device Call Home option enables the initiation of the connection
-    between the uCPE Device and the Enea uCPE Manager, from the uCPE device.
-    The Device Call Home option is required when deploying a uCPE device
-    behind NAT since the IP address of the uCPE device is hidden for the Enea
-    uCPE Manager.</para>
+    between the uCPE Device and the Enea Edge Management application, from the
+    uCPE device. The Device Call Home option is required when deploying a uCPE
+    device behind NAT since the IP address of the uCPE device is hidden for
+    the Enea Edge Management application.</para>
 
     <para>Enable Device Call Home by marking the Device Call Home checkbox
-    when registering the uCPE device in Enea uCPE Manager. When using this
-    mechanism, the device will initiate a connection to the Enea uCPE Manager
-    for NETCONF traffic (over SSH), while the Enea uCPE Manager waits for a
-    device connection.</para>
+    when registering the uCPE device in Enea Edge Management application. When
+    using this mechanism, the device will initiate a connection to the Enea
+    Edge Management application for NETCONF traffic (over SSH), while the
+    application waits for a device connection.</para>
   </section>
 
   <section id="device_net_config">
@@ -30,7 +30,7 @@
     selecting physical interfaces to be used by virtualized networking and
     creating different types of bridges to enable VNF communication.</para>
 
-    <para>The Zero Touch Provisioning mechanism is also touched upon, as
+    <para>The Zero Touch Provisioning mechanism is also touched upon, as an
     alternative to manual configuration of the virtualization
     infrastructure.</para>
 
@@ -43,16 +43,18 @@
 
       <para>In use cases where CPU capacity is very limited, disabling DPDK
       can free up CPU capacity and overall performance can improve. Navigate
-      to <literal>Configuration</literal> -&gt; <literal>DPDK</literal> and
-      deselect <literal>Enable DPDK</literal> to disable the DPDK.</para>
+      to <emphasis role="bold">Configuration</emphasis>, then <emphasis
+      role="bold">DPDK</emphasis> and deselect <emphasis role="bold">Enable
+      DPDK</emphasis> to disable the DPDK.</para>
 
       <note>
         <para>Disabling the DPDK cannot be done after other network
         configurations have been made.</para>
       </note>
 
-      <para>In <literal>Configuration</literal> -&gt; <literal>DPDK</literal>
-      it is also possible to configure DPDK resources such as:</para>
+      <para>In the <emphasis role="bold">Configuration</emphasis> menu, select
+      <emphasis role="bold">DPDK</emphasis>, here DPDK resources can also be
+      configured:</para>
 
       <itemizedlist>
         <listitem>
@@ -88,10 +90,13 @@
       virtualization infrastructure and VNFs, they must be configured into the
       management system.</para>
 
-      <para>To add an interface into the Enea uCPE Manager, select the uCPE
-      device, then from the top toolbar select <literal>Configuration -&gt;
-      External Interfaces -&gt; Configuration -&gt; Add</literal>. The
-      available Interface types are detailed below.</para>
+      <para>To add an interface into the Enea Edge Management application,
+      select the uCPE device, then from the top toolbar select <emphasis
+      role="bold">Configuration</emphasis>, then <emphasis
+      role="bold">External Interfaces</emphasis>, <emphasis
+      role="bold">Configuration</emphasis>, and click the <emphasis
+      role="bold">Add</emphasis> button. The available Interface types are
+      detailed below.</para>
 
       <section id="dpdk_interface_type">
         <title>DPDK Interface Type</title>
@@ -102,10 +107,12 @@
         bridge.</para>
 
         <note>
-          <para>Make sure the <literal>Enable DPDK</literal> checkbox is
-          selected in <literal>Device -&gt; Configuration -&gt;
-          DPDK</literal>, otherwise no interface can be assigned as
-          DPDK.</para>
+          <para>Make sure the <emphasis role="bold">Enable DPDK</emphasis>
+          checkbox is selected by accessing <emphasis
+          role="bold">Device</emphasis>, <emphasis
+          role="bold">Configuration</emphasis> and choosing <emphasis
+          role="bold">DPDK</emphasis>, otherwise no interface can be assigned
+          as DPDK.</para>
         </note>
 
         <para>To add a DPDK interface under the management system, set
@@ -184,10 +191,10 @@
         <title>Wan Interface Type</title>
 
         <para>WAN interfaces configured during the installation of the uCPE
-        device are automatically added in the Enea uCPE manager as type
-        <literal>wan</literal>. The WAN interface used for management of the
-        uCPE device is marked with the <literal>Management</literal> property
-        set to <literal>True</literal>.</para>
+        device are automatically added in the Enea Edge Management application
+        as type <literal>wan</literal>. The WAN interface used for management
+        of the uCPE device is marked with the <literal>Management</literal>
+        property set to <literal>True</literal>.</para>
 
         <para>If a WAN interface is to be assigned for use by a VNF, it must
         be changed into another interface type depending on the type of
@@ -200,11 +207,12 @@
 
         <orderedlist>
           <listitem>
-            <para>To edit an interface configuration type from the Enea uCPE
-            Manager, select the uCPE device, then from the top toolbar select
-            the <literal>Configuration</literal> menu then <literal>External
-            Interfaces -&gt; Configuration</literal>. The already configured
-            interfaces are displayed here, as can be seen in the figure
+            <para>To edit an interface configuration type from the Enea Edge
+            Management, select the uCPE device, then from the top toolbar
+            select the <emphasis role="bold">Configuration</emphasis> menu,
+            then <emphasis role="bold">External Interfaces</emphasis> and
+            <emphasis role="bold">Configuration</emphasis>. The already
+            configured interfaces are displayed here, as seen in the figure
             above.</para>
           </listitem>
 
@@ -212,9 +220,9 @@
             <para>In order to edit an already configured interface, (as in the
             example popup shown below, a WAN interface) double click on the
             desired one and a popup will appear. A different popup appears for
-            each type of interface. From the <literal>Host Interface</literal>
-            window, a user can change the networking type and the IP address
-            assignment:</para>
+            each type of interface. From the <emphasis role="bold">Host
+            Interface</emphasis> window, a user can change the networking type
+            and the IP address assignment:</para>
 
             <figure>
               <title>Editing an Interface</title>
@@ -239,17 +247,83 @@
         </note>
       </section>
 
+      <section id="wap_interface_type">
+        <title>Wap Interface Type</title>
+
+        <para>Wireless Access Point (Wap) interfaces are used to create
+        Wireless Access Points. Only interfaces with
+        <literal>wap-capable</literal> capabilities can be added as WAP
+        interfaces.</para>
+
+        <para><emphasis role="bold">How to edit the Configuration of a Wap
+        Interface</emphasis></para>
+
+        <orderedlist>
+          <listitem>
+            <para>To edit an interface configuration from the Enea Edge
+            Management, select the uCPE device, then from the top toolbar
+            select the <emphasis role="bold">Configuration</emphasis> menu
+            then <emphasis role="bold">External Interfaces</emphasis> and
+            select <emphasis role="bold">Configuration</emphasis>. The already
+            configured interfaces will be displayed here.</para>
+          </listitem>
+
+          <listitem>
+            <para>In order to edit an already configured interface, (as in the
+            example popup shown below, a WAP interface) double click on the
+            desired one and a pop-up will appear. A different pop-up appears
+            for each type of interface. From the <literal>Host
+            Interface</literal> window, the following parameters are
+            configurable:</para>
+
+            <itemizedlist>
+              <listitem>
+                <para>Country Code: the country code, a 2 letter
+                ISO3166-alpha2 identifier.</para>
+              </listitem>
+
+              <listitem>
+                <para>Wireless Band: 2.4 GHz or 5 GHz. Depending on the band
+                selection, the correct <literal>Wireless Mode</literal> and
+                <literal>Radio Channel</literal> must be provided.</para>
+              </listitem>
+            </itemizedlist>
+
+            <figure>
+              <title>Editing an Interface</title>
+
+              <mediaobject>
+                <imageobject>
+                  <imagedata align="center" contentwidth="475"
+                             fileref="images/wap_external_interface.png" />
+                </imageobject>
+              </mediaobject>
+            </figure>
+          </listitem>
+        </orderedlist>
+
+        <note>
+          <para>Correct <emphasis role="bold">Country Code</emphasis>
+          selection is mandatory. All configuration options are available in
+          the Enea Edge Management application GUI but only the Radio Settings
+          that conform with the selected country's official regulatory laws
+          will be applied when the Wireless AP is started on the uCPE
+          Device.</para>
+        </note>
+      </section>
+
       <section id="man_configuration">
         <title>Manual Configuration</title>
 
         <para>For Manual Configuration of uCPE networking, select the uCPE
-        device first and then <literal>Configuration</literal> -&gt;
-        <literal>External Interfaces</literal>, where one can find a list of
-        available network interfaces and their capabilities.</para>
+        device first, then access the <emphasis
+        role="bold">Configuration</emphasis> menu, and choose <emphasis
+        role="bold">External Interfaces</emphasis>, where a list of available
+        network interfaces and their capabilities can be found.</para>
 
-        <para>After networking interfaces have been added to the Enea uCPE
-        Manager, the user can change the interface type (DPDK, SR-IOV,
-        Standard, WAN).</para>
+        <para>After networking interfaces have been added to the Enea Edge
+        Management, the user can change the interface type (DPDK, SR-IOV,
+        Standard, WAN, WAP).</para>
 
         <figure>
           <title>Configuration of External Interfaces</title>
@@ -267,8 +341,8 @@
     <section id="configure_bridges">
       <title>Configuring Bridges</title>
 
-      <para>After networking interfaces have been added to the Enea uCPE
-      Manager, the user can create the necessary OVS bridges.</para>
+      <para>After networking interfaces have been added to the Enea Edge
+      Management, the user can create the necessary OVS bridges.</para>
 
       <figure>
         <title>OVS Bridges</title>
@@ -281,8 +355,8 @@
         </mediaobject>
       </figure>
 
-      <para><emphasis role="bold">How to add OVS bridges in the Enea uCPE
-      Manager</emphasis></para>
+      <para><emphasis role="bold">How to add OVS bridges in the Enea Edge
+      Management</emphasis></para>
 
       <orderedlist>
         <listitem>
@@ -290,23 +364,24 @@
         </listitem>
 
         <listitem>
-          <para>Select <literal>Configuration</literal>.</para>
+          <para>Select <emphasis role="bold">Configuration</emphasis>.</para>
         </listitem>
 
         <listitem>
-          <para>Click <literal>OpenvSwitch</literal>.</para>
+          <para>Click <emphasis role="bold">OpenvSwitch</emphasis>.</para>
         </listitem>
 
         <listitem>
-          <para>Select the <literal>Bridges</literal> option, then click
-          <literal>Add</literal>.</para>
+          <para>Select the <emphasis role="bold">Bridges</emphasis> option,
+          then click <emphasis role="bold">Add</emphasis>.</para>
         </listitem>
       </orderedlist>
 
       <note>
-        <para>Depending on the settings in <literal>Configuration -&gt;
-        OpenVSwitch -&gt; DPDK</literal>, OVS bridges with or without DPDK
-        support will be used on the uCPE device.</para>
+        <para>Depending on the settings found when accessing the <emphasis
+        role="bold">Configuration</emphasis> menu and selecting <emphasis
+        role="bold">DPDK</emphasis>, OVS bridges with or without DPDK support
+        will be used on the uCPE device.</para>
       </note>
 
       <para>There are three types of bridges which can be created, each one
@@ -355,7 +430,8 @@
         <itemizedlist>
           <listitem>
             <para><emphasis role="bold">Device management</emphasis>. Part of
-            the device configuration done by the Enea uCPE Manager.</para>
+            the device configuration done by the Enea Edge Management
+            application.</para>
           </listitem>
 
           <listitem>
@@ -405,9 +481,20 @@
 
         <itemizedlist>
           <listitem>
-            <para><emphasis role="bold">communication</emphasis>: allows for
-            VNF communication towards LAN/WAN networks. This bridge type has
-            at least one physical port attached to it.</para>
+            <para><emphasis role="bold">communication</emphasis>:
+            <itemizedlist>
+                <listitem>
+                  <para>Allows for VNF communication towards LAN/WAN networks.
+                  This bridge type has at least one physical port attached to
+                  it.</para>
+                </listitem>
+
+                <listitem>
+                  <para>Allows for creation of <literal>Wireless Access
+                  Points</literal>. This bridge type does not need a physical
+                  port attached to it.</para>
+                </listitem>
+              </itemizedlist></para>
           </listitem>
 
           <listitem>
@@ -422,11 +509,13 @@
 
         <itemizedlist>
           <listitem>
-            <para>name: name of the bridge.</para>
+            <para><emphasis role="bold">name</emphasis>: name of the
+            bridge.</para>
           </listitem>
 
           <listitem>
-            <para>ovs-bridge-type: select <literal>communication</literal> or
+            <para><emphasis role="bold">ovs-bridge-type</emphasis>: select
+            <literal>communication</literal> or
             <literal>integration</literal>, depending on intended usage. For
             communication bridges, physical interfaces can be added to the
             bridge.</para>
@@ -451,7 +540,7 @@
     physically present (initially) to manage the device.</para>
 
     <para>An offline configuration is usually prepared in advance for the Enea
-    uCPE Manager to setup the virtualization infrastructure on the uCPE
+    Edge Management to setup the virtualization infrastructure on the uCPE
     device, as soon as a device enrolls into the management system.</para>
 
     <section id="offline_configuration">
@@ -465,18 +554,20 @@
 
       <para>Alternatively, a wildcard can be used in the <literal>Device
       ID</literal> field, which results in a configuration being pushed on all
-      uCPE devices upon their initial connection towards the Enea uCPE
-      Manager.</para>
+      uCPE devices upon their initial connection towards the Enea Edge
+      Management.</para>
 
       <para>If the offline configuration is not configured for a uCPE device,
       an alarm will be raised: <literal>Day-0 Config:ZTP:Major</literal>,
-      which occurs when the uCPE device connects to the Enea uCPE Manager
-      informing that the ZTP setup failed for the specific uCPE device.</para>
+      which occurs when the uCPE device connects to the Enea Edge Management
+      application informing that the ZTP setup failed for the specific uCPE
+      device.</para>
 
-      <para>To create an offline configuration, from the top toolbar menu
-      select <literal>Applications</literal> -&gt; <literal>Offline
-      Config</literal> -&gt; <literal>Add</literal>. The following fields
-      should be filled:</para>
+      <para>To create an offline configuration, select from the top toolbar
+      the <emphasis role="bold">Applications</emphasis> menu, then <emphasis
+      role="bold">Offline Config</emphasis> and choose <emphasis
+      role="bold">Add</emphasis>. The following fields should be
+      filled:</para>
 
       <itemizedlist>
         <listitem>
@@ -511,13 +602,13 @@
 
       <para>The Name is user defined and can be set to any unique text string
       identifying the configuration. The Device Version will match the Enea
-      NFV Access version of the uCPE device and the Device ID will be set to
-      the previously set identifier of the uCPE device.</para>
+      Edge version of the uCPE device and the Device ID will be set to the
+      previously set identifier of the uCPE device.</para>
 
-      <para>When a device connects to the Enea uCPE Manager for the first
-      time, it checks the device to see if it has been Zero Touch Provisioned
-      (ZTP). If not, it looks for an offline configuration that matches these
-      values, in the following order:</para>
+      <para>When a device connects to the Enea Edge Management application for
+      the first time, it checks the device to see if it has been Zero Touch
+      Provisioned (ZTP). If not, it looks for an offline configuration that
+      matches these values, in the following order:</para>
 
       <itemizedlist>
         <listitem>
@@ -536,20 +627,22 @@
       <para>If a match is found, the offline configuration is sent to the
       device as part of Zero-Touch-Provisioning.</para>
 
-      <para>After creating the Offline Config Store, access the device through
-      <literal>Applications</literal> -&gt; <literal>offline config</literal>
-      -&gt; <literal>Config App</literal> and provision it with the required
+      <para>After creating the Offline Config Store, access the device by
+      selecting <emphasis role="bold">Applications</emphasis>, then <emphasis
+      role="bold">offline config</emphasis> and clicking <emphasis
+      role="bold">Config App</emphasis>, to provision it with the required
       initial configuration. This operation mirrors what happens during manual
       configuration described previously.</para>
 
       <note>
         <para>The ZTP will only be triggered the first time a uCPE device
-        connects to the Enea uCPE Manager. Just changing an offline
-        configuration will not push the new changes to the device. If an
-        offline configuration is changed after uCPE device registration, a
-        factory reset can be executed to force a new ZTP to execute by
-        selecting the device, then <literal>Operations</literal> -&gt;
-        <literal>factory reset</literal>.</para>
+        connects to the Enea Edge Management application. Just changing an
+        offline configuration will not push the new changes to the device. If
+        an offline configuration is changed after uCPE device registration, a
+        factory reset can be executed to force a new ZTP to execute. Select
+        the device, then access the <emphasis
+        role="bold">Operations</emphasis> menu and select <emphasis
+        role="bold">factory reset</emphasis>.</para>
       </note>
     </section>
   </section>
@@ -565,54 +658,66 @@
     <section id="upload_scripts">
       <title>Uploading Scripts</title>
 
-      <para>The scripts need to be uploaded to the Enea uCPE Manager prior to
-      use. When uploading scripts to the Enea uCPE Manager make sure to select
-      the right script type.</para>
+      <para>The scripts need to be uploaded to the Enea Edge Management
+      application prior to use. When uploading scripts to the Enea Edge
+      Management application make sure to select the right script type.</para>
 
       <para>The following script types are supported:</para>
 
       <itemizedlist>
         <listitem>
           <para><literal>Once-before-startup</literal>. This script will only
-          execute once during the startup.</para>
+          execute once after the system has rebooted, prior to processing any
+          device configuration.</para>
         </listitem>
 
         <listitem>
           <para><literal>Always-before-startup</literal>. This script will
-          always execute during the startup.</para>
+          always execute after the system has rebooted, prior to processing
+          any device configuration.</para>
         </listitem>
 
         <listitem>
-          <para><literal>Once-after-startup</literal>. This script will only
-          execute once after the system has been started.</para>
+          <para><literal>Once-after-startup</literal>. The script will always
+          execute after the system has rebooted, after all device
+          configuration processes have completed.</para>
         </listitem>
 
         <listitem>
           <para><literal>Always-after-startup</literal>. This script will
-          always execute after the system has been started.</para>
+          always execute after all device configuration processes have
+          completed after the system has rebooted.</para>
         </listitem>
       </itemizedlist>
 
+      <note>
+        <para>After a factory reset, any of the
+        <literal>Once-before-*</literal> or <literal>Once-after-*</literal>
+        scripts will be re-run as described above.</para>
+      </note>
+
       <para>Follow the instruction below to upload scripts:</para>
 
       <orderedlist>
         <listitem>
-          <para>Select <literal>Devices</literal> -&gt; <literal>Custom
-          Scripts</literal> -&gt; <literal>Configure</literal>.</para>
+          <para>Access the <emphasis role="bold">Devices</emphasis> menu, then
+          <emphasis role="bold">Custom Scripts</emphasis> and choose <emphasis
+          role="bold">Configure</emphasis>.</para>
         </listitem>
 
         <listitem>
-          <para>Select <literal>Upload to EMS</literal>.</para>
+          <para>Select <emphasis role="bold">Upload to EMS</emphasis>.</para>
         </listitem>
 
         <listitem>
-          <para>In the <literal>Script Type</literal> menu, select the type
-          the uploaded script should have.</para>
+          <para>In the <emphasis role="bold">Script Type</emphasis> menu,
+          select the type the uploaded script should have.</para>
         </listitem>
 
         <listitem>
-          <para>Press <literal>Choose File</literal> to select the scripts
-          needed, and then press <literal>Send</literal>.</para>
+          <para>Press <emphasis role="bold">Choose File</emphasis> to select
+          the scripts needed, and then click <emphasis
+          role="bold">Send</emphasis>.</para>
         </listitem>
       </orderedlist>
     </section>
@@ -620,19 +725,21 @@
     <section id="remove_scripts">
       <title>Removing Scripts</title>
 
-      <para>Follow the instruction below to remove scripts:</para>
+      <para>Follow the instruction below to remove scripts from the Enea Edge
+      Management application:</para>
 
       <orderedlist>
         <listitem>
-          <para>Select <literal>Devices</literal> -&gt; <literal>Custom
-          Scripts</literal> -&gt; <literal>Configure</literal>.</para>
+          <para>Access the <emphasis role="bold">Devices</emphasis> menu, then
+          <emphasis role="bold">Custom Scripts</emphasis> and select <emphasis
+          role="bold">Configure</emphasis>.</para>
         </listitem>
 
         <listitem>
-          <para>Select the script you want to delete from the
-          <literal>Uploaded Scripts</literal> tab and then click
-          <literal>Delete</literal>, which will remove the script immediately
-          from the Enea uCPE Manager.</para>
+          <para>Select the script you want to delete from the <emphasis
+          role="bold">Uploaded Scripts</emphasis> tab and then click <emphasis
+          role="bold">Delete</emphasis>, which will remove the script
+          immediately from the Enea Edge Management application.</para>
         </listitem>
       </orderedlist>
     </section>
@@ -640,18 +747,19 @@
     <section id="configure_scripts">
       <title>Configuring Script Location</title>
 
-      <para>The location where the scripts are staged in the Enea uCPE Manager
-      can be chanaged as described below:</para>
+      <para>The location where the scripts are staged in the Enea Edge
+      Management application can be changed as described below:</para>
 
       <orderedlist>
         <listitem>
-          <para>Select <literal>Devices</literal> -&gt; <literal>Custom
-          Scripts</literal> -&gt; <literal>Configure</literal>.</para>
+          <para>Access the <emphasis role="bold">Devices</emphasis> menu,
+          choose <emphasis role="bold">Custom Scripts</emphasis> and select
+          <emphasis role="bold">Configure</emphasis>.</para>
         </listitem>
 
         <listitem>
-          <para>Select the <literal>Configuration</literal> tab and specify a
-          new loacation to store the scripts.</para>
+          <para>Select the <emphasis role="bold">Configuration</emphasis> tab
+          and specify a new location to store the scripts.</para>
 
           <note>
             <para>Change the script storage location only if you have many
@@ -669,21 +777,23 @@
 
       <orderedlist>
         <listitem>
-          <para>Select <literal>Devices</literal> -&gt; <literal>Custom
-          Scripts</literal> -&gt; <literal>Apply Scripts</literal>.</para>
+          <para>Access the <emphasis role="bold">Devices</emphasis> menu,
+          choose <emphasis role="bold">Custom Scripts</emphasis> and select
+          <emphasis role="bold">Apply Scripts</emphasis>.</para>
         </listitem>
 
         <listitem>
-          <para>In the <literal>Script Config Screen</literal> pop up, select
-          the devices from the device(s) chooser list on which to run the
-          scripts. Press the <literal>&gt;</literal> button to move the
-          devices to the right side of the chooser, which is the list of
-          devices that will execute the selected scripts.</para>
+          <para>In the <emphasis role="bold">Script Config Screen</emphasis>
+          pop up, select the devices from the device(s) chooser list on which
+          to run the scripts. Press the <emphasis role="bold">&gt;</emphasis>
+          button to move the devices to the right side of the chooser, which
+          is the list of devices that will execute the selected
+          scripts.</para>
         </listitem>
 
         <listitem>
           <para>Select the scripts from the list under the device(s) chooser
-          by pressing the <literal>+</literal> button.</para>
+          by pressing the <emphasis role="bold">+</emphasis> button.</para>
         </listitem>
 
         <listitem>
@@ -694,18 +804,110 @@
         </listitem>
 
         <listitem>
-          <para>Check the checkbox <literal>Reboot devices</literal> if you
-          want to reboot and execute the scripts at once and then press
-          <literal>ok</literal>.</para>
+          <para>Check the <emphasis role="bold">Reboot devices</emphasis>
+          checkbox if you want to reboot and execute the scripts at once and
+          then select <emphasis role="bold">ok</emphasis>.</para>
 
           <note>
             <para>The status of execution for the scripts can be seen by
-            opening the <literal>Fault</literal> -&gt;
-            <literal>Events</literal> screen and filtering by device and/or
-            the event name <filename>CustomScriptExecuted</filename>.</para>
+            accessing <emphasis role="bold">Fault</emphasis>, opening the
+            <emphasis role="bold">Events</emphasis> screen and filtering by
+            device and/or the event name
+            <filename>CustomScriptExecuted</filename>.</para>
           </note>
         </listitem>
       </orderedlist>
     </section>
+
+    <section id="remove_script_device">
+      <title>Removing Scripts from a uCPE Device</title>
+
+      <para>Follow the instructions below to remove scripts from a uCPE
+      Device:</para>
+
+      <orderedlist>
+        <listitem>
+          <para>Access the <emphasis role="bold">Operations</emphasis> menu
+          and select <emphasis role="bold">Delete Custom
+          Script</emphasis>.</para>
+        </listitem>
+
+        <listitem>
+          <para>In the <emphasis role="bold">Delete Custom Script</emphasis>
+          pop up, set the name and the type of the script that should be
+          deleted and press <emphasis role="bold">Execute</emphasis>. If the
+          <emphasis role="bold">Script Type</emphasis> remains unset, the
+          script will be deleted regardless of its type.</para>
+        </listitem>
+      </orderedlist>
+    </section>
+  </section>
+
+  <section id="wireless_access_point">
+    <title>Wireless Access Point</title>
+
+    <para>The Wireless AP Screen from the Enea Edge Management Configuration
+    menu allows users to configure a <literal>Wireless Access Point</literal>.
+    A <literal>wap-capable</literal> interface and a LAN bridge must be added
+    before doing the Wireless AP configuration. For more details see sections
+    <link linkend="wap_interface_type">Wap interface Type</link> and <link
+    linkend="dataplane_bridge">Data-plane bridge</link>.</para>
+
+    <para>The following parameters are configurable:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>SSID: the Wireless network name - any string with a max. length
+        of 32 octets.</para>
+      </listitem>
+
+      <listitem>
+        <para>Interface Name: the <literal>wap-capable</literal> external
+        interface.</para>
+      </listitem>
+
+      <listitem>
+        <para>Lan Bridge: the LAN bridge where wireless clients will be
+        hosted.</para>
+      </listitem>
+
+      <listitem>
+        <para>WAP Security Mode: <literal>open</literal> or
+        <literal>wpa2Psk</literal>. When choosing <literal>wpa2Psk</literal>,
+        a <literal>password</literal> and an <literal>encryption</literal>
+        must be provided. The <literal>password</literal> can be any string
+        with a minimum length of 8 and a maximum length of 63
+        characters.</para>
+      </listitem>
+
+      <listitem>
+        <para>DHCP Server: <literal>disabled</literal> or
+        <literal>enabled</literal>. When <literal>enabled</literal> is
+        selected, the range of IPs (<literal>IP Address Start</literal> -
+        <literal>IP Address End</literal>), <literal>Netmask</literal> and
+        <literal>Gateway</literal> values must be provided.</para>
+      </listitem>
+    </itemizedlist>
+
+    <figure>
+      <title>Wireless AP</title>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" contentwidth="600"
+                     fileref="images/wap_wireless_ap.png" />
+        </imageobject>
+      </mediaobject>
+    </figure>
+
+    <note>
+      <para>Only a single Wireless AP is allowed on a physical interface. The
+      validation of the <literal>wap-capable</literal> interface is done when
+      adding the Wireless AP, so, in case of an error, the parameters of the
+      <literal>wap-capable</literal> interface must be rechecked. This can be
+      done by accessing the <emphasis role="bold">Configuration</emphasis>
+      menu and selecting <emphasis role="bold">External
+      Interfaces</emphasis>.</para>
+    </note>
   </section>
 </chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-getting-started/doc/troubleshooting.xml b/doc/book-enea-edge-getting-started/doc/troubleshooting.xml
index e176cec..fcf991e 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/troubleshooting.xml
+++ b/doc/book-enea-edge-getting-started/doc/troubleshooting.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="troubleshooting">
   <title>Troubleshooting and Recovery</title>
 
-  <para>The following is a small list of possible Enea NFV Access problems,
-  and their solutions. <emphasis role="bold">In all scenarios collect the logs
-  if possible for debugging.</emphasis> More information on log collecting can
-  be found in <olink targetdoc="book_enea_nfv_access_getting_started"
-  targetptr="log_collector">Using the Log Collector in the <xi:include
+  <para>In all scenarios where possible, collect the logs for debugging. More
+  information on log collecting can be found in <olink
+  targetdoc="book_enea_edge_getting_started" targetptr="log_collector">Using
+  the Log Collector in the <xi:include
   href="../../s_docbuild/olinkdb/pardoc-names.xml"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
+  xpointer="element(book_enea_edge_getting_started/1)" /></olink>
   Manual.</para>
 
-  <para>If you encounter other issues or can't get Enea NFV Access to work
-  successfully after consulting the information below, please use the <olink
-  targetdoc="book_enea_nfv_access_release_info"
-  targetptr="contacting_enea_support">Enea Support team Form, available in the
+  <para>The following is a small list of possible Enea Edge problems, and
+  their solutions. If you encounter other issues or can't get Enea Edge to
+  work successfully after consulting the information below, please use the
+  <olink targetdoc="book_enea_edge_release_info"
+  targetptr="contacting_enea_support">Enea Support Team Form, available in the
   <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xpointer="element(book_enea_nfv_access_release_info/1)" /></olink> Manual
+  xpointer="element(book_enea_edge_release_info/1)" /></olink> Manual
   downloaded with your release.</para>
 
   <table>
@@ -29,7 +29,7 @@
 
       <thead>
         <row>
-          <entry align="center">Enea NFV Access Problem</entry>
+          <entry align="center">Enea Edge Problem</entry>
 
           <entry align="center">Solution</entry>
         </row>
@@ -37,19 +37,19 @@
 
       <tbody>
         <row>
-          <entry>A uCPE device fails to connect to the Enea uCPE Manager after
-          installation.</entry>
-
-          <entry>If the uCPE device is not able to connect to the Enea uCPE
-          Manager after an installation, the Web-installer application is
-          started automatically on the uCPE device to change the configuration
-          via a web browser. Please see <olink
-          targetdoc="book_enea_nfv_access_getting_started"
+          <entry>A uCPE device fails to connect to the Enea Edge Management
+          application after installation.</entry>
+
+          <entry>If the uCPE device is not able to connect to the Enea Edge
+          Management application after an installation, the Web-installer
+          application is started automatically on the uCPE device to change
+          the configuration via a web browser. Please see <olink
+          targetdoc="book_enea_edge_getting_started"
           targetptr="boot_device_add_map">Booting the uCPE device and adding
           it to the Map in the <xi:include
           href="../../s_docbuild/olinkdb/pardoc-names.xml"
           xmlns:xi="http://www.w3.org/2001/XInclude"
-          xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
+          xpointer="element(book_enea_edge_getting_started/1)" /></olink>
           Manual.</entry>
         </row>
 
@@ -59,41 +59,40 @@
           <entry><orderedlist>
               <listitem>
                 <para>Perform a hardware reboot of the uCPE Device and select
-                the previous Enea NFV Access image from the GRUB menu. This
+                the previous Enea Edge Runtime image from the GRUB menu. This
                 action assumes physical access to the uCPE device.</para>
               </listitem>
 
               <listitem>
                 <para>Reinitiate the Upgrade procedure according to the steps
-                in section <olink
-                targetdoc="book_enea_nfv_access_getting_started"
+                in section <olink targetdoc="book_enea_edge_getting_started"
                 targetptr="upgrade_devices">uCPE device upgrades in the
                 <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude"
-                xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
+                xpointer="element(book_enea_edge_getting_started/1)" /></olink>
                 Manual.</para>
               </listitem>
             </orderedlist></entry>
         </row>
 
         <row>
-          <entry>After a failed uCPE device upgrade the previous Enea NFV
-          Access image (from the GRUB menu) does not boot.</entry>
-
-          <entry>Reinstall Enea NFV Access on the uCPE device and redeploy the
-          initial configuration and virtualized services, by following the
-          steps in <olink targetdoc="book_enea_nfv_access_getting_started"
-          targetptr="install_ena_device">Installing Enea NFV Access - uCPE
-          Device installation in the <xi:include
+          <entry>After a failed uCPE device upgrade the previous Enea Edge
+          Runtime image (from the GRUB menu) does not boot.</entry>
+
+          <entry>Reinstall Enea Edge Runtime on the uCPE device and redeploy
+          the initial configuration and virtualized services, by following the
+          steps in <olink targetdoc="book_enea_edge_getting_started"
+          targetptr="install_ena_device">Installing Enea Edge - uCPE Device
+          installation in the <xi:include
           href="../../s_docbuild/olinkdb/pardoc-names.xml"
           xmlns:xi="http://www.w3.org/2001/XInclude"
-          xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
+          xpointer="element(book_enea_edge_getting_started/1)" /></olink>
           Manual.</entry>
         </row>
 
         <row>
-          <entry>The Enea uCPE Manager upgrade fails and a working snapshot is
-          available.</entry>
+          <entry>The Enea Edge Management application upgrade fails and a
+          working snapshot is available.</entry>
 
           <entry>If a working snapshot obtained during a previous Upgrade or
           Uninstall is available
@@ -107,20 +106,21 @@
 
               <listitem>
                 <para>Restore the previous installation as described in <olink
-                targetdoc="book_enea_nfv_access_getting_started"
+                targetdoc="book_enea_edge_getting_started"
                 targetptr="restore_prev_ucpe_install">Restoring a previous
-                uCPE Manager installation in the <xi:include
+                Enea Edge Management installation in the <xi:include
                 href="../../s_docbuild/olinkdb/pardoc-names.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude"
-                xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
+                xpointer="element(book_enea_edge_getting_started/1)" /></olink>
                 Manual.</para>
               </listitem>
             </orderedlist></entry>
         </row>
 
         <row>
-          <entry>The Enea uCPE Manager upgrade fails and no working snapshot
-          is available, but a System Back-up file exists.</entry>
+          <entry>The Enea Edge Management application upgrade fails and no
+          working snapshot is available, but a System Back-up file
+          exists.</entry>
 
           <entry><orderedlist>
               <listitem>
@@ -131,21 +131,22 @@
 
               <listitem>
                 <para>Perform an installation with the restore option of a
-                previous Enea uCPE Manager configuration as described in
-                <olink targetdoc="book_enea_nfv_access_getting_started"
+                previous Enea Edge Management configuration as described in
+                <olink targetdoc="book_enea_edge_getting_started"
                 targetptr="install_ucpemg_from_backup">Installation of the
-                uCPE Manager using a System Back-up in the <xi:include
-                href="../../s_docbuild/olinkdb/pardoc-names.xml"
+                Enea Edge Management application using a System Back-up in the
+                <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude"
-                xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
+                xpointer="element(book_enea_edge_getting_started/1)" /></olink>
                 Manual.</para>
               </listitem>
             </orderedlist></entry>
         </row>
 
         <row>
-          <entry>The uCPE device is booted, the ssh connection is available
-          but the device is not connected to the Enea uCPE Manager.</entry>
+          <entry>The uCPE device is booted, the SSH connection is available
+          but the device is not connected to the Enea Edge Management
+          application.</entry>
 
           <entry><orderedlist>
               <listitem>
@@ -154,13 +155,14 @@
               </listitem>
 
               <listitem>
-                <para>Use the <literal>Reconnect</literal> button from the
-                Enea uCPE Manager's GUI.</para>
+                <para>Use the <emphasis role="bold">Reconnect</emphasis>
+                button from the Enea Edge Management applications's
+                GUI.</para>
               </listitem>
 
               <listitem>
-                <para>Connect to uCPE Device console and run the factory reset
-                script:</para>
+                <para>Connect to the uCPE Device console and run the factory
+                reset script:</para>
 
                 <programlisting>/usr/local/odm/bin/factory_reset.sh</programlisting>
               </listitem>
@@ -168,12 +170,12 @@
               <listitem>
                 <para>If the above actions do not work, reinstall and
                 reconfigure the device using the steps provided in <olink
-                targetdoc="book_enea_nfv_access_getting_started"
-                targetptr="install_ena_device">Installing Enea NFV Access -
-                uCPE Device installation in the <xi:include
+                targetdoc="book_enea_edge_getting_started"
+                targetptr="install_ena_device">Installing Enea Edge - uCPE
+                Device installation in the <xi:include
                 href="../../s_docbuild/olinkdb/pardoc-names.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude"
-                xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
+                xpointer="element(book_enea_edge_getting_started/1)" /></olink>
                 Manual.</para>
               </listitem>
             </orderedlist></entry>
@@ -185,12 +187,12 @@
 
           <entry>Perform a hardware reboot on the uCPE device. If the problem
           is not fixed, reinstall and reconfigure the device using the steps
-          provided in <olink targetdoc="book_enea_nfv_access_getting_started"
-          targetptr="install_ena_device">Installing Enea NFV Access - uCPE
-          Device installation in the <xi:include
+          provided in <olink targetdoc="book_enea_edge_getting_started"
+          targetptr="install_ena_device">Installing Enea Edge - uCPE Device
+          installation in the <xi:include
           href="../../s_docbuild/olinkdb/pardoc-names.xml"
           xmlns:xi="http://www.w3.org/2001/XInclude"
-          xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
+          xpointer="element(book_enea_edge_getting_started/1)" /></olink>
           Manual.</entry>
         </row>
 
@@ -205,17 +207,18 @@
               </listitem>
 
               <listitem>
-                <para>Reboot the device using <literal>Operations</literal>
-                -&gt; <literal>Reboot</literal> menu options from within the
-                Enea uCPE Manager.</para>
+                <para>Reboot the device by accessing <emphasis
+                role="bold">Operations</emphasis> and then selecting <emphasis
+                role="bold">Reboot</emphasis> from within the Enea Edge
+                Management application.</para>
               </listitem>
 
               <listitem>
                 <para>If the above actions do not work, redeploy all services.
-                This is done by cleaning up the existing configuration using:
-                <literal>Operations</literal> -&gt; <literal>Factory
-                Reset</literal> for a specific device and redeploying the VNF
-                services.</para>
+                This is done by cleaning up the existing configuration by
+                accessing <emphasis role="bold">Operations</emphasis>, then
+                selecting <emphasis role="bold">Factory Reset</emphasis> for a
+                specific device and redeploying the VNF services.</para>
               </listitem>
             </orderedlist></entry>
         </row>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/upgrade_ena.xml b/doc/book-enea-edge-getting-started/doc/upgrade_ena.xml
index 01fd8ec..ac2ebb6 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/upgrade_ena.xml
+++ b/doc/book-enea-edge-getting-started/doc/upgrade_ena.xml
@@ -1,39 +1,40 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <chapter id="upgrade_ena">
-  <title>Upgrading Enea NFV Access</title>
+  <title>Upgrading Enea Edge</title>
 
   <para>Enea provides regular releases that will require the upgrading of Enea
-  NFV Access components. The Enea uCPE Manager must be upgraded first,
-  followed by upgrading Enea NFV Access Runtime on the uCPE devices.</para>
+ Edge components. The Enea Edge Management application must be upgraded
+  first, followed by upgrading the Enea Edge Runtime on the uCPE
+  devices.</para>
 
   <section id="upgrade_mg">
-    <title>Upgrading the Enea uCPE Manager</title>
+    <title>Upgrading the Enea Edge Management application</title>
 
     <note>
-      <para>It is recommended to create a system backup by accessing:
-      <literal>System</literal> -&gt; <literal>System Backup</literal> from
-      the Enea uCPE Manager GUI, for recovery in case of an upgrade
-      failure.</para>
+      <para>It is recommended to create a system backup by accessing the
+      <emphasis role="bold">System</emphasis> menu and selecting <emphasis
+      role="bold">System Backup</emphasis> from the Enea Edge Management GUI,
+      for recovery in case of an upgrade failure.</para>
     </note>
 
     <orderedlist>
       <listitem>
         <para>Extract the
-        <filename>Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename>
+        <filename>Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename>
         folder.</para>
 
         <para>The directory in which the archive has been unpacked will be
-        denoted as <literal>&lt;uCPEM-installdir&gt;</literal>.</para>
+        denoted as <literal>&lt;uCPEM-installerdir&gt;</literal>.</para>
       </listitem>
 
       <listitem>
-        <para>Enter <literal>&lt;uCPEM-installdir&gt;</literal>.</para>
+        <para>Enter <literal>&lt;uCPEM-installerdir&gt;/dist</literal>.</para>
       </listitem>
 
       <listitem>
         <para>Run the following command with the root account and change
-        <literal>/opt/ems</literal> to the correct location of the Enea uCPE
-        Manager installation:</para>
+        <literal>/opt/ems</literal> to the correct location of the Enea Edge
+        Management installation:</para>
 
         <programlisting>./upgrade.sh /opt/ems \
 Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</programlisting>
@@ -52,11 +53,12 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
         <para>Create a compressed file of the <literal>ucpemanager</literal>
         application folder
         (<filename>ucpemanager-Back-up-YYYYddMMHHmm.tar.gz</filename>), which
-        contains a snapshot of the existing installation.</para>
+        contains a snapshot of the existing installation in the
+        <literal>&lt;uCPEM-installerdir&gt;/dist</literal> directory.</para>
 
         <note>
           <para>The snapshot file created during the upgrade can be used for
-          restoring the Enea uCPE Manager.</para>
+          restoring the Enea Edge Management application.</para>
         </note>
       </listitem>
 
@@ -70,39 +72,57 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
       </listitem>
     </itemizedlist>
 
+    <para><olink targetdoc="book_enea_edge_getting_started"
+    targetptr="fresh_ucpemg_install">Fresh Installation of the Enea Edge
+    Management in the <ns:include
+    href="../../s_docbuild/olinkdb/pardoc-names.xml"
+    xmlns:ns="http://www.w3.org/2001/XInclude"
+    xpointer="element(book_enea_edge_getting_started/1)" /></olink> Manual
+    contains information about the input required to be entered during the
+    execution of the upgrade script.</para>
+
+    <para condition="hidden">For an example on how to upgrade an Enea Edge
+    Management installation in a High Availability setup, consult <olink
+    targetdoc="book_enea_edge_getting_started"
+    targetptr="ha_upgrade">Upgrading a High Availability Deployment in the
+    <ns:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
+    xmlns:ns="http://www.w3.org/2001/XInclude"
+    xpointer="element(book_enea_edge_getting_started/1)" /></olink>
+    Manual.</para>
+
     <section id="restore_prev_ucpe_install">
-      <title>Restoring a previous Enea uCPE Manager Installation</title>
+      <title>Restoring a previous Enea Edge Management Installation</title>
 
-      <para><emphasis role="bold">How to restore a previous Enea uCPE Manager
-      installation</emphasis></para>
+      <para><emphasis role="bold">How to restore a previous Enea Edge
+      Management installation</emphasis></para>
 
       <orderedlist>
         <listitem>
           <para>Extract
-          <filename>Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename></para>
+          <filename>Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename></para>
         </listitem>
 
         <listitem>
           <para>The directory in which the archive has been unpacked will be
-          denoted as <literal>&lt;uCPEM-installdir&gt;</literal>.</para>
+          denoted as <literal>&lt;uCPEM-installerdir&gt;</literal>.</para>
         </listitem>
 
         <listitem>
           <para>Copy the snapshot file
           (<filename>ucpemanager-Backup-YYYYddMMHHmm.tar.gz</filename>)
-          created during a previous Enea uCPE Manager Upgrade or Enea uCPE
-          Manager Uninstall Operation into the
-          <literal>&lt;uCPEM-installdir&gt;</literal> directory.</para>
+          created during a previous Enea Edge Management Upgrade or Enea Edge
+          Management Uninstall Operation into the
+          <literal>&lt;uCPEM-installerdir&gt;/dist</literal> directory.</para>
         </listitem>
 
         <listitem>
-          <para>Enter <literal>&lt;uCPEM-installdir&gt;</literal>.</para>
+          <para>Enter <literal>&lt;uCPEM-installerdir&gt;/dist</literal>.</para>
         </listitem>
 
         <listitem>
           <para>Run the following command with the root user and change
-          <literal>/opt/ems</literal> to the correct location of the Enea uCPE
-          Manager installation:</para>
+          <literal>/opt/ems</literal> to the correct location of the Enea Edge
+          Management installation:</para>
 
           <programlisting>./restore.sh /opt/ems ucpemanager-Backup-YYYYddMMHHmm.tar.gz</programlisting>
         </listitem>
@@ -117,9 +137,9 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
         </listitem>
 
         <listitem>
-          <para>Reinstall the Enea uCPE Manager application on the specified
-          target location, restoring the data in the database and files in the
-          process.</para>
+          <para>Reinstall the Enea Edge Management application on the
+          specified target location, restoring the data in the database and
+          files in the process.</para>
         </listitem>
       </itemizedlist>
 
@@ -128,21 +148,28 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
     </section>
 
     <section id="uninstall_ucpem_install">
-      <title>Uninstalling an existing Enea uCPE Manager Installation</title>
+      <title>Uninstalling an existing Enea Edge Management
+      Installation</title>
 
-      <para><emphasis role="bold">How to uninstall an existing Enea uCPE
-      Manager installation</emphasis></para>
+      <para><emphasis role="bold">How to uninstall an existing Enea Edge
+      Management installation</emphasis></para>
 
       <orderedlist>
         <listitem>
-          <para>Navigate to the folder where the Enea uCPE Manager is
-          installed: <filename>&lt;uCPEM-installdir&gt;</filename>.</para>
+          <para>Navigate to the folder where the Enea Edge Management
+          application is unpacked:
+          <filename>&lt;uCPEM-installerdir&gt;</filename>.</para>
+        </listitem>
+        
+        <listitem>
+          <para>Enter
+          <literal>&lt;uCPEM-installerdir&gt;/dist</literal>.</para>
         </listitem>
 
         <listitem>
           <para>Run the following command with the root user and change
-          <literal>/opt/ems</literal> to the correct location of the Enea uCPE
-          Manager installation:</para>
+          <literal>/opt/ems</literal> to the correct location of the Enea Edge
+          Management installation:</para>
 
           <programlisting>./uninstall.sh /opt/ems</programlisting>
         </listitem>
@@ -165,13 +192,13 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
 
           <note>
             <para>The snapshot file created during the uninstall can be used
-            for restoring the Enea uCPE Manager.</para>
+            for restoring the Enea Edge Management application.</para>
           </note>
         </listitem>
 
         <listitem>
           <para>Uninstall the <literal>ucpemanager</literal> service, so that
-          it will not startup on reboot.</para>
+          it will not start up on reboot.</para>
         </listitem>
 
         <listitem>
@@ -184,15 +211,15 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
         </listitem>
       </itemizedlist>
 
-      <para>After these steps, the Enea uCPE Manager is completely removed
-      from the system.</para>
+      <para>After these steps, the Enea Edge Management application is
+      completely removed from the system.</para>
     </section>
   </section>
 
   <section id="upgrade_devices">
     <title>uCPE device Upgrades</title>
 
-    <para>A uCPE device can be upgraded using the Enea uCPE Manager
+    <para>A uCPE device can be upgraded using the Enea Edge Management
     GUI.</para>
 
     <section id="device_up_process">
@@ -217,43 +244,53 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
           upgrades the uCPE device to a newer version.</para>
         </listitem>
       </orderedlist>
+
+      <note>
+        <para>Upgrading from Enea NFV Access 2.3.0 is not possible when using
+        the Enea Edge Management application in HTTPS mode. Either switch to
+        HTTP by accessing the <emphasis role="bold">System</emphasis> menu,
+        clicking on <emphasis role="bold">Configuration</emphasis>, then
+        <emphasis role="bold">Web Access</emphasis> and checking the <emphasis
+        role="bold">Enable HTTP</emphasis> box, or by installing Edge Enea
+        2.4.0 on the device manually.</para>
+      </note>
     </section>
 
     <section id="mg_upgrade">
-      <title>Managing the device Upgrade</title>
+      <title>Managing the uCPE device Upgrade</title>
 
       <para>Before an installation or upgrade can be completed, certain
       configuration data must be set. Files also need to be uploaded to the
-      Device Upgrade image repository to be uploaded to the device.</para>
+      Device Upgrade image repository in order to be uploaded to the
+      device.</para>
 
       <para>Launch the Device Upgrade management console by selecting
-      <literal>Devices</literal> -&gt; <literal>Upgrade</literal> from the top
-      tool-bar. The console will contain the following tabs:</para>
+      <emphasis role="bold">Devices</emphasis> and then the <emphasis
+      role="bold">Upgrade</emphasis> button from the top tool-bar. The console
+      will contain the following tabs:</para>
 
       <itemizedlist>
         <listitem>
-          <para><literal>Image Library</literal>. To add/delete an
-          image.</para>
+          <para><emphasis role="bold">Image Library</emphasis>. To add/delete
+          an image.</para>
         </listitem>
 
         <listitem>
-          <para><literal>Upgrade Operations</literal>. See running upgrades,
-          cancel any upgrades in progress, start a uCPE device upgrade.</para>
+          <para><emphasis role="bold">Upgrade Operations</emphasis>. See
+          upgrades that are currently running, cancel any upgrades in
+          progress, or start a uCPE device upgrade.</para>
         </listitem>
 
         <listitem>
-          <para><literal>Configuration</literal>. Upgrade configuration
-          parameters.</para>
+          <para><emphasis role="bold">Configuration</emphasis>. Upgrade
+          configuration parameters.</para>
         </listitem>
       </itemizedlist>
 
-      <para>Press Close when the message <literal>File Uploaded
-      Successfully</literal> appears on the File Upload Screen.</para>
-
       <note>
-        <para>The uCPE Device upgrade is done with image files of type
+        <para>The uCPE Device upgrade is done with image files of the type
         <literal>rootfs.ostree.tar.bz2</literal>, which are available in the
-        <filename>Enea_NFV_Access_Run_Time_Platform_&lt;processor&gt;_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename>
+        <filename>Enea_Edge_Runtime_&lt;processor&gt;_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename>
         file you downloaded with your release.</para>
       </note>
 
@@ -263,18 +300,19 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
         <para><emphasis role="bold">Adding an image to the image
         repository/library</emphasis><orderedlist>
             <listitem>
-              <para>Select <literal>Devices</literal> -&gt;
-              <literal>Upgrade</literal>.</para>
+              <para>Select <emphasis role="bold">Devices</emphasis> and then
+              the <emphasis role="bold">Upgrade</emphasis> button.</para>
             </listitem>
 
             <listitem>
-              <para>Select <literal>Add</literal> from the <literal>Image
-              Library</literal> tab to add a new image file.</para>
+              <para>Select <emphasis role="bold">Add</emphasis> from the
+              <emphasis role="bold">Image Library</emphasis> tab to add a new
+              image file.</para>
             </listitem>
 
             <listitem>
-              <para>Click on <literal>Choose File</literal> to provide the
-              path to the image file (must be of type
+              <para>Select <emphasis role="bold">Choose File</emphasis> to
+              provide the path to the image file (must be of type
               <literal>rootfs.os-tree.tar.bz2</literal>).</para>
             </listitem>
 
@@ -285,8 +323,8 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
             </listitem>
 
             <listitem>
-              <para>Click <literal>Send</literal> to upload the image to the
-              image repository.</para>
+              <para>Click <emphasis role="bold">Send</emphasis> to upload the
+              image to the image repository.</para>
             </listitem>
           </orderedlist></para>
 
@@ -295,14 +333,14 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
 
         <orderedlist>
           <listitem>
-            <para>Select <literal>Devices</literal> -&gt;
-            <literal>Upgrade</literal>.</para>
+            <para>Select <emphasis role="bold">Devices</emphasis> and then the
+            <emphasis role="bold">Upgrade</emphasis> button.</para>
           </listitem>
 
           <listitem>
-            <para>Select the image you want to delete from the <literal>Image
-            Library</literal> tab and then click
-            <literal>Delete</literal>.</para>
+            <para>Select the image you want to delete from the <emphasis
+            role="bold">Image Library</emphasis> tab and then click <emphasis
+            role="bold">Delete</emphasis>.</para>
           </listitem>
         </orderedlist>
       </section>
@@ -310,12 +348,12 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
       <section id="upgrade_options">
         <title>Upgrade Operations</title>
 
-        <para>The <literal>Upgrade Operations</literal> tab allows a user to
-        manage uCPE device upgrades in the system. It allows the user to see
-        all the upgrades that are currently in progress, as well as listing
-        the completed ones. If an upgrade succeeds or fails, then a row will
-        be added to the completed upgrades table. If one fails, the failure
-        message will be visible in the table.</para>
+        <para>The <emphasis role="bold">Upgrade Operations</emphasis> tab
+        allows a user to manage uCPE device upgrades in the system. It allows
+        the user to see all the upgrades that are currently in progress, as
+        well as listing the completed ones. If an upgrade succeeds or fails,
+        then a row will be added to the completed upgrades table. If one
+        fails, the failure message will be visible in the table.</para>
 
         <note>
           <para>The list of completed upgrade tasks resides in the cache
@@ -325,16 +363,17 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
         <para><emphasis role="bold">How to Install/Upgrade a device
         immediately or schedule the process for later</emphasis><orderedlist>
             <listitem>
-              <para>Select <literal>Devices</literal> -&gt;
-              <literal>Upgrade</literal>.</para>
+              <para>Select <emphasis role="bold">Devices</emphasis> and then
+              the <emphasis role="bold">Upgrade</emphasis> button.</para>
             </listitem>
 
             <listitem>
-              <para>Select <literal>Upgrade Devices</literal> from the
-              <literal>Upgrade Operations</literal> tab. This will launch a
-              <literal>Multi Device Install Image</literal> screen that will
-              allow the user to install and upgrade more than one uCPE device
-              at a time or upgrade later.</para>
+              <para>Select <emphasis role="bold">Upgrade Devices</emphasis>
+              from the <emphasis role="bold">Upgrade Operations</emphasis>
+              tab. This will launch a <literal>Multi Device Install
+              Image</literal> screen that will allow the user to install and
+              upgrade more than one uCPE device at a time or upgrade
+              later.</para>
             </listitem>
           </orderedlist></para>
 
@@ -347,8 +386,8 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
             when to run the upgrade.</para>
 
             <note>
-              <para>The hour represents the local Enea uCPE Manager server
-              hour.</para>
+              <para>The hour represents the local Enea Edge Management
+              application server hour.</para>
             </note>
           </listitem>
 
@@ -360,8 +399,9 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
           </listitem>
 
           <listitem>
-            <para><literal>Image File</literal>. Click on <literal>Choose
-            Image File</literal> to select the image file.</para>
+            <para><literal>Image File</literal>. Click on <emphasis
+            role="bold">Choose Image File</emphasis> to select the image
+            file.</para>
           </listitem>
 
           <listitem>
@@ -369,13 +409,15 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
             can accept an image file is populated when the image file is
             chosen.</para>
 
-            <para>Press the <literal>&gt;</literal> button to move the uCPE
+            <para>Mark the uCPE devices that you wish to upgrade and press the
+            <emphasis role="bold">&gt;</emphasis> button to move the uCPE
             devices to the right side of the selector. Those chosen form the
             list of uCPE devices that will be upgraded.</para>
           </listitem>
 
           <listitem>
-            <para>Upgrade Operation. The available options are:</para>
+            <para><literal>Upgrade Operation</literal>. The available options
+            are:</para>
 
             <itemizedlist>
               <listitem>
@@ -397,6 +439,11 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
               </listitem>
             </itemizedlist>
           </listitem>
+
+          <listitem>
+            <para>To start the upgrade, click <emphasis
+            role="bold">ok</emphasis>.</para>
+          </listitem>
         </itemizedlist>
 
         <note>
@@ -410,8 +457,8 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
 
         <para>The installed releases on a uCPE device can be viewed by
         selecting the uCPE device first, then from the top toolbar selecting
-        <literal>Configuration</literal> -&gt;
-        <literal>Upgrade</literal>.</para>
+        <emphasis role="bold">Configuration</emphasis> and then the <emphasis
+        role="bold">Upgrade</emphasis> button.</para>
 
         <para>The installed releases on the uCPE device, the release status,
         release state, <literal>commit-id</literal> and release version will
@@ -422,30 +469,31 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
         <title>uCPE device Upgrade Status</title>
 
         <para>The status of the installation and upgrade can be viewed in the
-        <literal>Upgrade Operations</literal> tab. Ongoing or scheduled
-        upgrade operations can be viewed or cancelled.</para>
+        <emphasis role="bold">Upgrade Operations</emphasis> tab. Ongoing or
+        scheduled upgrade operations can be viewed or cancelled.</para>
 
         <para><emphasis role="bold">To view the status of an installation or
         upgrade operations</emphasis></para>
 
         <orderedlist>
           <listitem>
-            <para>Select <literal>Devices</literal> -&gt;
-            <literal>Upgrade</literal>.</para>
+            <para>Select <emphasis role="bold">Devices</emphasis> and then the
+            <emphasis role="bold">Upgrade</emphasis> button.</para>
           </listitem>
 
           <listitem>
-            <para>Select <literal>Upgrade Operations</literal>. The ongoing
-            operations are listed at the top and a history of failed or
-            successful operations are listed at the bottom.</para>
+            <para>Select <emphasis role="bold">Upgrade Operations</emphasis>.
+            The ongoing operations are listed at the top and a history of
+            failed or successful operations are listed at the bottom.</para>
           </listitem>
 
           <listitem>
-            <para>Select an <literal>Active</literal> or <literal>Completed
-            Upgrade Operation</literal> and click the <literal>Device
-            Status</literal> button to see detailed information regarding the
-            upgrade operation, including the uCPE devices involved and
-            information per uCPE device.</para>
+            <para>Select an <emphasis role="bold">Active</emphasis> or
+            <emphasis role="bold">Completed Upgrade Operation</emphasis> and
+            then the <emphasis role="bold">Device Status</emphasis> button to
+            see detailed information regarding the upgrade operation,
+            including the uCPE devices involved and information per uCPE
+            device.</para>
           </listitem>
         </orderedlist>
 
@@ -454,15 +502,16 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
 
         <orderedlist>
           <listitem>
-            <para>Select <literal>Devices</literal> -&gt;
-            <literal>Upgrade</literal> -&gt; <literal>Upgrade
-            Operations</literal>.</para>
+            <para>Select <emphasis role="bold">Devices</emphasis>, then the
+            <emphasis role="bold">Upgrade</emphasis> button and choose
+            <emphasis role="bold">Upgrade Operations</emphasis>.</para>
           </listitem>
 
           <listitem>
-            <para>Select an operation from the list and press <literal>Cancel
-            Upgrade</literal> and <literal>Confirm</literal>. The operation
-            will then be deleted from the list.</para>
+            <para>Select an operation from the list and choose <emphasis
+            role="bold">Cancel Upgrade</emphasis> and <emphasis
+            role="bold">Confirm</emphasis>. The operation will then be deleted
+            from the list.</para>
           </listitem>
         </orderedlist>
       </section>
@@ -472,19 +521,20 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
 
         <note>
           <para>The default values present in the configuration of each uCPE
-          device are recommended for use. Modifying them is for an Advanced
-          User only.</para>
+          device are recommended for use. Modifying them is for an <emphasis
+          role="bold">Advanced User</emphasis> only.</para>
         </note>
 
         <para><emphasis role="bold">How to Configure the uCPE device
         Upgrade</emphasis><orderedlist>
             <listitem>
-              <para>Select <literal>Devices</literal> -&gt;
-              <literal>Upgrade</literal>.</para>
+              <para>Select <emphasis role="bold">Devices</emphasis> and then
+              the <emphasis role="bold">Upgrade</emphasis> button.</para>
             </listitem>
 
             <listitem>
-              <para>Select <literal>Configuration</literal>.</para>
+              <para>Select <emphasis
+              role="bold">Configuration</emphasis>.</para>
             </listitem>
 
             <listitem>
@@ -528,17 +578,45 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
 
         <para>Each uCPE device can receive image files and use them to
         upgrade. This can be done by selecting the uCPE device in the
-        <literal>System</literal> view and clicking the
-        <literal>Upgrade</literal> button. In the new window, an upgrade image
-        can be chosen from the <literal>Image Files</literal> tab by selecting
-        the image file from the list and clicking the <literal>Install on
-        Device</literal> button.</para>
+        <emphasis role="bold">System</emphasis> view and clicking the
+        <emphasis role="bold">Upgrade</emphasis> button. In the new window, an
+        upgrade image can be chosen from the <emphasis role="bold">Image
+        Files</emphasis> tab by selecting the image file from the list and
+        clicking the <emphasis role="bold">Install on Device</emphasis>
+        button. The Image files that appear in the <emphasis role="bold">Image
+        Library</emphasis> tab can be uploaded to the Enea Edge Management
+        Application by following the steps listed in <link
+        linkend="image_lib">Image Library</link>.</para>
 
         <para>Once an image is installed on the uCPE device, the image will be
-        available on the uCPE device and be visible in the
-        <literal>Releases</literal> tab. It can then be selected from the list
-        and the upgrade started by clicking the <literal>Upgrade</literal>
-        button.</para>
+        available on the uCPE device and be visible in the <emphasis
+        role="bold">Releases</emphasis> tab. There are two ways to make it
+        active, choose one or the other:</para>
+
+        <itemizedlist>
+          <listitem>
+            <para>Select it from the list and then start the upgrade by
+            clicking the <emphasis role="bold">Upgrade</emphasis>
+            button.</para>
+          </listitem>
+
+          <listitem>
+            <para>Select <emphasis role="bold">Operations</emphasis>, then 
+            <emphasis role="bold">Upgrade</emphasis>, enter the
+            <literal>Release Name</literal> and press <emphasis
+            role="bold">Execute</emphasis>. Filling in the <literal>Restore
+            Archive</literal> text field is optional and should be left unset
+            if the <literal>NFVi Snapshot</literal> feature is
+            disabled.</para>
+          </listitem>
+        </itemizedlist>
+
+        <para>If an installed image is no longer needed, it can be removed
+        from the device by selecting <emphasis
+        role="bold">Operations</emphasis> and <emphasis role="bold">Remove
+        Release</emphasis>. In the <emphasis role="bold">Remove
+        Release</emphasis> window, provide the <literal>Release Name</literal>
+        and press <emphasis role="bold">Execute</emphasis>.</para>
       </section>
     </section>
   </section>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/vnf_mg.xml b/doc/book-enea-edge-getting-started/doc/vnf_mg.xml
index 2dfe248..058be40 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/vnf_mg.xml
+++ b/doc/book-enea-edge-getting-started/doc/vnf_mg.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="vnf_mg">
   <title>VNF Management</title>
 
-  <para>The Enea uCPE Manager is responsible for onboarding, configuring (e.g.
-  CloudInit) and ensuring life cycle management of VNFs that are instantiated
-  and run on the various uCPE devices.</para>
+  <para>The Enea Edge Management application is responsible for onboarding,
+  configuring (e.g. CloudInit) and ensuring life cycle management of VNFs that
+  are instantiated and run on various uCPE devices.</para>
 
   <section id="onboarding_a_vnf">
     <title>Onboarding a VNF</title>
 
-    <para>The onboarding of a VNF means adding it to the Enea uCPE Manager VNF
-    Catalogue and preparing it for instantiation (deployment on connected uCPE
-    devices). This is accomplished using the Enea uCPE Manager Onboarding
-    graphical user interface.</para>
+    <para>The onboarding of a VNF means adding it to the Enea Edge Management
+    application VNF Catalogue and preparing it for instantiation (deployment
+    on connected uCPE devices). This is accomplished using the Enea Edge
+    Management Onboarding graphical user interface.</para>
 
     <para>Typically, the Getting Started Guide of a VNF, provided by the VNF
     vendor, contains all necessary information needed to onboard a VNF.</para>
@@ -35,8 +35,9 @@
           <note>
             <para>There are no standard ways of managing VNF licenses,
             therefore no general guidelines can be provided. One example of
-            license handling that can be employed in the Enea uCPE Manager is
-            the adding of a license during the Cloud-Init setup.</para>
+            license handling that can be employed in the Enea Edge Management
+            application is the adding of a license during the Cloud-Init
+            setup.</para>
           </note>
         </listitem>
 
@@ -109,32 +110,28 @@
     </section>
 
     <section id="onboard_in_ucpemg">
-      <title>Onboarding into the Enea uCPE Manager</title>
+      <title>Onboarding into the Enea Edge Management application</title>
 
-      <para><emphasis role="bold">How to onboard a VNF into the Enea uCPE
-      Manager </emphasis></para>
+      <para><emphasis role="bold">How to onboard a VNF into the Enea Edge
+      Management application</emphasis></para>
 
       <orderedlist>
         <listitem>
-          <para>Select from the top toolbar <literal>VNF</literal> -&gt;
-          <literal>Descriptors</literal></para>
+          <para>Select from the top toolbar <emphasis
+          role="bold">VNF</emphasis> and then <emphasis
+          role="bold">Descriptors</emphasis>.</para>
         </listitem>
 
         <listitem>
-          <para>Click the <literal>On-board</literal> button.</para>
-        </listitem>
-
-        <listitem>
-          <para>When prompted by the UI, make sure the <literal>VM
-          Image</literal> radio button at the top of the onboarding screen is
-          selected, it will trigger a popup menu window.</para>
+          <para>Click the <emphasis role="bold">Onboard</emphasis>
+          button.</para>
         </listitem>
       </orderedlist>
 
       <para>This window contains data fields where both necessary and optional
       information about the VNF can be supplied. After doing so, press the
-      Onboard button, the Enea uCPE Manager will create the VNF descriptor and
-      add it to its VNF Catalog.</para>
+      Onboard button and the Enea Edge Management application will create the
+      VNF descriptor and add it to its VNF Catalog.</para>
 
       <figure>
         <title>Onboard a VNF</title>
@@ -153,8 +150,8 @@
         <listitem>
           <para><emphasis role="bold">VM Image File</emphasis>. This is the
           Virtual Machine image file for the VNF. Typically, it is a QCOW
-          image. Press <literal>Choose File</literal> and select the image you
-          wish to upload.</para>
+          image. Press <emphasis role="bold">Choose File</emphasis> and select
+          the image you wish to upload.</para>
         </listitem>
 
         <listitem>
@@ -171,7 +168,7 @@
         <listitem>
           <para><emphasis role="bold">Description</emphasis>. This field
           contains any description provided and is only displayed in the GUI
-          tables in the Enea uCPE Manager.</para>
+          tables in the Enea Edge Management application.</para>
         </listitem>
 
         <listitem>
@@ -203,25 +200,26 @@
 
       <para><emphasis role="bold">Interfaces Tab</emphasis></para>
 
-      <para>Click on the <literal>Interfaces</literal> tab to show the
-      Interfaces table.</para>
+      <para>Click on the <emphasis role="bold">Interfaces</emphasis> tab to
+      show the Interfaces table.</para>
 
       <para>This table will contain the interfaces required by this VNF to be
       configured, when creating an instance. Consult the VNF vendor to
       determine which and how many are required. Each interface requires a
-      name, and optionally a description, used only by the Enea uCPE
-      Manager.</para>
+      name, and optionally a description, used only by the Enea Edge
+      Management application.</para>
 
       <note>
-        <para>CAUTION: The user MUST conserve the same order for the virtual
-        interfaces during both onboarding and instantiation phases.</para>
+        <para>CAUTION: The user MUST save and use the same order for the
+        virtual interfaces during both the onboarding and instantiation
+        phases.</para>
       </note>
 
       <para><emphasis role="bold">Cloud Init Tab</emphasis></para>
 
-      <para>Click the <literal>Cloud Init</literal> tab to provide the
-      Cloud-Init configuration. There are three fields that need to be
-      populated:</para>
+      <para>Click the <emphasis role="bold">Cloud Init</emphasis> tab to
+      provide the Cloud-Init configuration. There are three fields that need
+      to be populated:</para>
 
       <orderedlist>
         <listitem>
@@ -246,7 +244,7 @@
 
             <listitem>
               <para><emphasis role="bold">NoCloud</emphasis>. This is a
-              simpler method that uses only one cloud init file
+              simpler method that uses only one cloud-init file
               (User-Data).</para>
             </listitem>
 
@@ -273,14 +271,14 @@
           <para>The <literal>Content Files Table</literal> is ONLY used if
           <literal>ConfigDrive</literal> is chosen as the Cloud-Init
           Datasource. For each content file added, a <literal>Path</literal>
-          must be provided. When the Enea uCPE Manager is used to create an
-          instance for multiple VNFs, the user will be prompted to provide a
-          data file for each entry in this table. Each type of VNF will
-          require different cloud-init files, e.g.: a license file. The data
-          files will be added to the cloud-init image that the user provides
-          at the instantiation of the VNF. If the cloud-init image is not
-          provided, no Cloud-Init Data Source will be created for that VNF and
-          there will be no warning.</para>
+          must be provided. When the Enea Edge Management application is used
+          to create an instance for multiple VNFs, the user will be prompted
+          to provide a data file for each entry in this table. Each type of
+          VNF will require different cloud-init files, e.g.: a license file.
+          The data files will be added to the cloud-init image that the user
+          provides at the instantiation of the VNF. If the cloud-init image is
+          not provided, no Cloud-Init Data Source will be created for that VNF
+          and there will be no warning.</para>
         </listitem>
       </orderedlist>
 
@@ -292,9 +290,9 @@
       <para>In this table, you can enter values for properties that will be
       used during instantiation of the VNF. The values will augment the
       default values in the <filename>domain.xml</filename> file used by
-      <literal>libvirt/virsh</literal> (running in Enea NFV Access) when
-      creating an instance of the VNF. Consult with the VNF Vendor or ENEA
-      support for values needed by specific VNFs.</para>
+      <literal>libvirt/virsh</literal> (running in Enea Edge) when creating an
+      instance of the VNF. Consult with the VNF Vendor or ENEA support for
+      values needed by specific VNFs.</para>
 
       <para><emphasis role="bold">Property Values</emphasis></para>
 
@@ -349,12 +347,12 @@
 
     <orderedlist>
       <listitem>
-        <para>Select from the top toolbar <literal>VNF</literal> -&gt;
-        <literal>Instances</literal></para>
+        <para>Select from the top toolbar <emphasis role="bold">VNF</emphasis>
+        and choose <emphasis role="bold">Instances</emphasis>.</para>
       </listitem>
 
       <listitem>
-        <para>Click the <literal>Add</literal> button.</para>
+        <para>Click the <emphasis role="bold">Add</emphasis> button.</para>
       </listitem>
 
       <listitem>
@@ -406,13 +404,64 @@
       </listitem>
 
       <listitem>
-        <para>Hit the <literal>Create</literal> button to deploy the VNF and
-        run it on the specified uCPE device.</para>
+        <para>Hit the <emphasis role="bold">Create</emphasis> button to deploy
+        the VNF and run it on the specified uCPE device.</para>
+      </listitem>
+    </orderedlist>
+
+    <para>Selecting the <emphasis role="bold">VNF</emphasis> menu then
+    choosing <emphasis role="bold">Events</emphasis> will show that the VNF
+    was created and a connection was established.</para>
+  </section>
+
+  <section id="vm_operations">
+    <title>VNF Instance Operations</title>
+
+    <para>Various operations can be done to a VNF instance. It can be paused,
+    resumed, stopped, started or deleted.</para>
+
+    <orderedlist>
+      <listitem>
+        <para>Select from the top toolbar <emphasis role="bold">VNF</emphasis>
+        and choose <emphasis role="bold">Instances</emphasis>.</para>
+      </listitem>
+
+      <listitem>
+        <para>Select an instance that needs to be modified.</para>
+      </listitem>
+
+      <listitem>
+        <para>Depending on the desired action, click the <emphasis
+        role="bold">Delete/ Force Delete / Start / Stop / Pause /
+        Resume</emphasis> button, respectively.</para>
       </listitem>
     </orderedlist>
 
-    <para>Selecting the<literal> VNF -&gt; Events</literal> menu will show
-    that the VNF was created and a connection was established.</para>
+    <para>Alternatively, these same operations can be performed by:</para>
+
+    <orderedlist>
+      <listitem>
+        <para>Selecting <emphasis role="bold">Operations</emphasis>.</para>
+      </listitem>
+
+      <listitem>
+        <para>Depending on the desired action, choosing <emphasis
+        role="bold">Destroy / Start / Stop / Pause / Resume VM</emphasis>
+        respectively.</para>
+      </listitem>
+
+      <listitem>
+        <para>The <literal>Id</literal> of the VM that should be modified can
+        be found by selecting <emphasis role="bold">Configuration</emphasis>,
+        then <emphasis role="bold">Virtual Machines</emphasis>, and then
+        accessing the <emphasis role="bold">VMs</emphasis> tab.</para>
+      </listitem>
+
+      <listitem>
+        <para>Provide the <literal>Id</literal> of the VM that should be
+        modified and press <emphasis role="bold">Execute</emphasis>.</para>
+      </listitem>
+    </orderedlist>
   </section>
 
   <section id="enter_console">
@@ -425,8 +474,9 @@
 
     <orderedlist>
       <listitem>
-        <para>SSH to the uCPE device from the Enea uCPE Manager
-        (<literal>Device-&gt;SSH</literal>) using:</para>
+        <para>SSH to the uCPE device from the Enea Edge Management application
+        (access the <emphasis role="bold">Device</emphasis> menu and select
+        <emphasis role="bold">SSH</emphasis>) using:</para>
 
         <itemizedlist>
           <listitem>
@@ -437,13 +487,16 @@
           </listitem>
 
           <listitem>
-            <para>For reverse ssh connections (ssh to a uCPE device behind
+            <para>For reverse SSH connections (SSH to a uCPE device behind
             NAT): the <literal>Username</literal> (default: root) and the
-            <literal>Reverse ssh</literal> checkbox checked. The port will be
-            automatically choosen by the Enea uCPE Manager in the range
-            defined in the <literal>System -&gt; Configuration -&gt; Reverse
-            SSH</literal> configuration panel. By default, the start port will
-            be <literal>7000</literal> and the maximum number of ports
+            <literal>Reverse SSH</literal> checkbox checked. The port will be
+            automatically chosen by the Enea Edge Management application in
+            the range defined in the <emphasis role="bold">SSH</emphasis>
+            configuration panel, available when accessing the <emphasis
+            role="bold">System</emphasis> menu, then <emphasis
+            role="bold">Configuration</emphasis> and choosing <emphasis
+            role="bold">Reverse SSH</emphasis> . By default, the start port
+            will be <literal>7000</literal> and the maximum number of ports
             allocated to all devices is 10. Only one port per device is
             allowed.</para>
 
diff --git a/doc/book-enea-nfv-access-release-info/swcomp.mk b/doc/book-enea-edge-getting-started/swcomp.mk
index 3ba7c8d..41e4416 100644..100755
--- a/doc/book-enea-nfv-access-release-info/swcomp.mk
+++ b/doc/book-enea-edge-getting-started/swcomp.mk
@@ -5,6 +5,6 @@ BOOK_VER ?= $(REL_VER)-dev
 
 DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
 
-BOOKPACKAGES := book-enea-nfv-access-release-info
-BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access $(PROD_VER) Release Information"
+BOOKPACKAGES := book-enea-edge-getting-started
+BOOKDESC_$(BOOKPACKAGES) := "Enea Edge $(PROD_VER) Getting Started"
 BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-ucpem-open-source/doc/README b/doc/book-enea-edge-management-open-source/doc/README
index 1077acb..1077acb 100644
--- a/doc/book-enea-nfv-access-ucpem-open-source/doc/README
+++ b/doc/book-enea-edge-management-open-source/doc/README
diff --git a/doc/book-enea-nfv-access-ucpem-open-source/doc/about.xml b/doc/book-enea-edge-management-open-source/doc/about.xml
index d443886..e13cd41 100644
--- a/doc/book-enea-nfv-access-ucpem-open-source/doc/about.xml
+++ b/doc/book-enea-edge-management-open-source/doc/about.xml
@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <chapter id="ucpemg-open-source-packages-and-licenses">
   <title>About this Report</title>
 
   <para>This document contains the open source and license information
-  pertaining to packages provided with Enea NFV Access <xi:include
+  pertaining to packages relating to the Enea Edge Management application
+  provided with Enea Edge <xi:include
   href="../../s_doceneacommon/doc/eltf_params_updated.xml"
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xpointer="element(EneaLinux_REL_VER/1)" />.</para>
diff --git a/doc/book-enea-nfv-access-ucpem-open-source/doc/book.xml b/doc/book-enea-edge-management-open-source/doc/book.xml
index d140047..715fbe6 100644
--- a/doc/book-enea-nfv-access-ucpem-open-source/doc/book.xml
+++ b/doc/book-enea-edge-management-open-source/doc/book.xml
@@ -3,8 +3,8 @@
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED">
 ]>
-<book id="book_enea_nfv_access_ucpem_open_source">
-  <title><trademark class="registered">Enea</trademark> NFV Access uCPE Manager Open Source Report</title>
+<book id="book_enea_edge_management_open_source">
+  <title><trademark class="registered">Enea</trademark> Edge Management Open Source Report</title>
   <subtitle>Release Version
          <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
          xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
diff --git a/doc/book-enea-nfv-access-ucpem-open-source/doc/licenses.xml b/doc/book-enea-edge-management-open-source/doc/licenses.xml
index 7ec52f3..92b4729 100644
--- a/doc/book-enea-nfv-access-ucpem-open-source/doc/licenses.xml
+++ b/doc/book-enea-edge-management-open-source/doc/licenses.xml
@@ -95,6 +95,13 @@
         <entry>Logging libraries</entry>

         <entry><ulink url="http://www.apache.org/licenses/">Apache 2.0</ulink></entry>

     </row>

+    

+    <row>

+        <entry><ulink url="https://commons.apache.org/proper/commons-codec/">Apache Commons Codec</ulink></entry>

+        <entry>1.9</entry>

+        <entry>MD5 libraries</entry>

+        <entry><ulink url="http://www.apache.org/licenses/">Apache 2.0</ulink></entry>

+    </row>

 

     <row>

         <entry><ulink url="http://www.small-icons.com/packs/24x24-free-application-icons.htm">Application Icons</ulink></entry>

@@ -445,7 +452,7 @@
 

     <row>

         <entry><ulink url="https://downloads.mariadb.org/client-java/">MariaDB Java client</ulink></entry>

-        <entry>1.3.0</entry>

+        <entry>2.7.2</entry>

         <entry>Java client for MariaDB database and MySQL</entry>

         <entry><ulink url="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html">GNU LesserGPL 2.1</ulink></entry>

     </row>

diff --git a/doc/book-enea-nfv-access-example-usecases/swcomp.mk b/doc/book-enea-edge-management-open-source/swcomp.mk
index 972746a..4a18540 100755..100644
--- a/doc/book-enea-nfv-access-example-usecases/swcomp.mk
+++ b/doc/book-enea-edge-management-open-source/swcomp.mk
@@ -5,6 +5,6 @@ BOOK_VER ?= $(REL_VER)-dev
 
 DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
 
-BOOKPACKAGES := book-enea-nfv-access-example-usecases
-BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access $(PROD_VER) Example Use-cases"
+BOOKPACKAGES := book-enea-edge-management-open-source
+BOOKDESC_$(BOOKPACKAGES) := "Enea Edge Management Open Source Report"
 BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-release-info/doc/about_release.xml b/doc/book-enea-edge-release-info/doc/about_release.xml
index e9c80aa..349c955 100644
--- a/doc/book-enea-nfv-access-release-info/doc/about_release.xml
+++ b/doc/book-enea-edge-release-info/doc/about_release.xml
@@ -1,44 +1,60 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <chapter id="relinfo-about-release">
   <title>About This Release</title>
 
-  <para>Enea NFV Access is a complete NFVI software platform designed for
-  deployment on any white box uCPE device, and optimized for common use cases.
-  Enea NFV Access includes both the Runtime Platform deployed on a white box,
-  and a management component with automation tools deployed in a private or
-  public cloud.</para>
+  <para>Enea Edge is a complete Virtualization Infrastructure software
+  platform designed for deployment on any white box uCPE device, and optimized
+  for common use-cases. It includes the Enea Edge Runtime deployed
+  on a white box, the Enea Edge Management application and the Enea Edge 
+    Automation, management and automation tools deployed in a 
+    private or public cloud.</para>
 
-  <para>The Enea NFV Access <xi:include
+  <para>The Enea Edge <xi:include
   href="../../s_doceneacommon/doc/eltf_params_updated.xml"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xpointer="element(EneaLinux_REL_VER/1)" /> Release includes a new version of
-  the major components as well as other features and optimizations, and
-  documentation updates. A list of new features and improvements can be found
-  in <xref linkend="relinfo-changes-other">Section 2.1 New Features and
-  Improvements</xref>.</para>
-
+  xpointer="element(EneaLinux_REL_VER/1)" /> Release includes new features, 
+    optimizations, corrections, and updates to the user documentation.. 
+    A list of major new features and improvements can be found in  
+    <xref linkend="relinfo-changes-other">Section 2.1 New Features and Improvements</xref>.</para>
+  
   <section id="release-content">
-    <title>Enea NFV Access Release Content</title>
+    <title>Enea Edge Release Content</title>
 
     <para>The release content is detailed below:</para>
 
+    <para>Main Components</para>
+
     <itemizedlist>
       <listitem>
-        <para>Enea_NFV_Access_Run_Time_Platform_C3000_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</para>
+        <para>Enea_Edge_Runtime_C3000_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</para>
+      </listitem>
+
+      <listitem>
+        <para>Enea_Edge_Runtime_XeonD_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</para>
+      </listitem>
+
+      <listitem>
+        <para>Enea_Edge_Automation_&lt;version&gt;-build&lt;build_number&gt;.zip</para>
       </listitem>
 
       <listitem>
-        <para>Enea_NFV_Access_Run_Time_Platform_XeonD_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</para>
+        <para>Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</para>
       </listitem>
 
       <listitem>
-        <para>Enea_NFV_Access_AF-TH_&lt;version&gt;-build&lt;build_number&gt;.zip</para>
+        <para>Enea_Edge_AF-TH_&lt;version&gt;-build&lt;build_number&gt;.zip
+        (deprecated, see <xref linkend="relinfo-changes-other">Section 2.1 New
+        Features and Improvements</xref>.)</para>
       </listitem>
+    </itemizedlist>
+
+    <para>Example Deployments:</para>
 
+    <itemizedlist>
       <listitem>
-        <para>Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</para>
+        <para>Enea_Edge_Telemetry_Deploy_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</para>
       </listitem>
 
       <listitem>
@@ -47,7 +63,7 @@
     </itemizedlist>
 
     <programlisting condition="arm">-- documentation/
-   /* Enea NFV Access documentation */
+   /* Enea Edge documentation */
 -- README
 -- aarch64 /* architecture */
         -- cn8304/
@@ -94,46 +110,57 @@
   <section id="relinfo-documentation">
     <title>User Documentation</title>
 
-    <para>This release of Enea NFV Access contains the following set of
+    <para>This release of Enea Edge contains the following set of
     documents:</para>
 
     <itemizedlist>
       <listitem>
-        <para>Enea NFV Access Release Information. Describes the Enea NFV
-        Access release content.</para>
+        <para>Enea Edge Release Information. Describes the Enea Edge release
+        content, main changes, the list of known issues and
+        limitations.</para>
+      </listitem>
+
+      <listitem>
+        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_edge_getting_started/1)" />. Describes how
+        to deploy and upgrade an Enea Edge base configuration, advanced
+        configurations of the system as well as troubleshooting
+        information.</para>
       </listitem>
 
       <listitem>
         <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
         xmlns:xi="http://www.w3.org/2001/XInclude"
-        xpointer="element(book_enea_nfv_access_getting_started/1)" />.
-        Describes how to install the Enea uCPE Manager, the Enea NFV Access
-        Runtime platform and Device Management.</para>
+        xpointer="element(book_enea_edge_example_usecases/1)" />. Describes
+        examples of onboarding, instantiating and configuring various
+        VNFs.</para>
       </listitem>
 
       <listitem>
         <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
         xmlns:xi="http://www.w3.org/2001/XInclude"
-        xpointer="element(book_enea_nfv_access_example_usecases/1)" />.
-        Describes examples of onboarding, instantiating and configuring
-        various VNFs.</para>
+        xpointer="element(book_enea_edge_automation_user_guide/1)" />.
+        Describes the Enea Edge Automation and provides instructions regarding
+        the necessary steps to configure and run the tool.</para>
       </listitem>
 
       <listitem>
         <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
         xmlns:xi="http://www.w3.org/2001/XInclude"
-        xpointer="element(book_enea_nfv_access_auto_fw_th_user_guide/1)" />.
-        Describes the Automation Framework and Test Harness for Enea NFV
-        Access and provides instructions regarding the necessary steps to run
-        these software tools.</para>
+        xpointer="element(book_enea_edge_auto_fw_th_user_guide/1)" />.
+        Describes the Automation Framework and Test Harness for Enea Edge
+        (deprecated, see <xref linkend="relinfo-changes-other">Section 2.1 New
+        Features and Improvements</xref>).</para>
       </listitem>
 
       <listitem>
         <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
         xmlns:xi="http://www.w3.org/2001/XInclude"
-        xpointer="element(book_enea_nfv_access_system_test_specification/1)" />.
-        Describes a sample Test Suite for System Testing of Enea NFV
-        Access.</para>
+        xpointer="element(book_enea_edge_system_test_specification/1)" />.
+        Describes a sample Test Suite for System Testing of Enea Edge.
+        (deprecated, see <xref linkend="relinfo-changes-other">Section 2.1 New
+        Features and Improvements</xref>).</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -141,20 +168,20 @@
   <section id="release-browsers">
     <title>Supported Web Browsers</title>
 
-    <para>The current release has been tested using the following web
+    <para>The current release supports using the following web
     browsers:</para>
 
     <itemizedlist>
       <listitem>
-        <para>Google Chrome v86</para>
+        <para>Google Chrome (tested with version 89).</para>
       </listitem>
 
       <listitem>
-        <para>Mozilla Firefox v82</para>
+        <para>Mozilla Firefox (tested with version 87).</para>
       </listitem>
 
       <listitem>
-        <para>Microsoft Edge v84</para>
+        <para>Microsoft Edge (tested with version 89).</para>
       </listitem>
     </itemizedlist>
   </section>
diff --git a/doc/book-enea-nfv-access-release-info/doc/book.xml b/doc/book-enea-edge-release-info/doc/book.xml
index 2a48d5a..0b77f41 100644
--- a/doc/book-enea-nfv-access-release-info/doc/book.xml
+++ b/doc/book-enea-edge-release-info/doc/book.xml
@@ -1,15 +1,16 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED">
 ]>
-<book id="book_enea_nfv_access_release_info">
-  <title><trademark class="registered">Enea</trademark> NFV Access Release
+<book id="book_enea_edge_release_info">
+  <title><trademark class="registered">Enea</trademark> Edge Release
   Information</title>
 
-  <subtitle>Release Version
-         <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
-         xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
+  <subtitle>Release Version <xi:include
+  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xpointer="element(EneaLinux_REL_VER/1)" /></subtitle>
 
   <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
 
@@ -27,4 +28,4 @@
 
   <xi:include href="../../s_docbuild/template/docsrc_common/contacting_enea_nfva.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
-</book>
+</book>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-release-info/doc/getting_enea_nfv_access.xml b/doc/book-enea-edge-release-info/doc/getting_enea_nfv_access.xml
index 9eecd3c..9eecd3c 100644
--- a/doc/book-enea-nfv-access-release-info/doc/getting_enea_nfv_access.xml
+++ b/doc/book-enea-edge-release-info/doc/getting_enea_nfv_access.xml
diff --git a/doc/book-enea-nfv-access-release-info/doc/jiraissues_override.xml b/doc/book-enea-edge-release-info/doc/jiraissues_override.xml
index 7282d0f..7282d0f 100644
--- a/doc/book-enea-nfv-access-release-info/doc/jiraissues_override.xml
+++ b/doc/book-enea-edge-release-info/doc/jiraissues_override.xml
diff --git a/doc/book-enea-edge-release-info/doc/known_bugs_and_limitations.xml b/doc/book-enea-edge-release-info/doc/known_bugs_and_limitations.xml
new file mode 100644
index 0000000..81816a5
--- /dev/null
+++ b/doc/book-enea-edge-release-info/doc/known_bugs_and_limitations.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<chapter id="bugs-limitations">
+  <title>Known Issues and Limitations in this Release</title>
+
+  <para>This chapter lists the known general issues and limitations that
+  affect the current release.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para><remark>LXCR-9904</remark>Enea Edge Runtime cannot be installed on
+      USB storage devices.</para>
+    </listitem>
+
+    <listitem>
+      <para><remark>LXCR-9799</remark>Proper boot order is not ensured if a
+      uCPE device has more than one HDD attached.</para>
+    </listitem>
+
+    <listitem>
+      <para><remark>ELCCR-527</remark>Cancelling a file upload in the Enea
+      Edge Management will require the user to close and reopen the upload
+      window for the next upload to work.</para>
+    </listitem>
+
+    <listitem>
+      <para><remark>ELCCR-577</remark>If the Enea Edge Management application
+      is restored from a backup made on a release version older than Enea NFV
+      Access 2.2.3, VNFs cannot be instantiated from the GUI.</para>
+    </listitem>
+    
+    <listitem>
+      <para><remark>ELCCR-1134</remark>In order to avoid an incorrect boot 
+        order after a failed upgrade, the user should remove the upgrade 
+        image before attempting again.</para>
+    </listitem>
+
+    <listitem>
+      <para><remark>ELCCR-474</remark>Deleting VNF instances with flows
+      configured on the OVS bridges can be done only after removing the
+      flows.</para>
+    </listitem>
+
+    <listitem>
+      <para><remark>ELCCR-572</remark>Sometimes when selecting and deleting
+      more than one VNF instance simultaneously, an error message might be
+      triggered, even if the delete operation succeeds.</para>
+    </listitem>
+
+    <listitem>
+      <para><remark>ELCCR-847</remark>The Juniper vSRX VNF cannot be
+      instantiated on the Xeon-D architectures due to missing CPU features in
+      the VNF's domain XML. This impacts all example use cases where the
+      Juniper VNF is used.</para>
+    </listitem>
+
+    <listitem>
+      <para><remark>USERDOCAP-648</remark>The <literal>storage size</literal>
+      parameter on the VNF onboarding page is ignored. The default storage
+      size specified when creating the VM image is used when instantiating the
+      VM and when presenting VM information.</para>
+    </listitem>
+
+    <listitem>
+      <para><remark>LXCR-9853</remark>The WAN interface of a uCPE device needs
+      to be connected to a network with at least a router/gateway installed
+      for next-hop communication.</para>
+    </listitem>
+    
+    <listitem>
+      <para><remark>ELCCR-1504</remark>To change the type of an interface 
+        from DPDK to SR-IOV, first delete the existing interface, then 
+        recreate it with the desired type.</para>
+    </listitem>
+
+    <listitem>
+      <para><remark>LXCR-9992</remark>Depending on hardware capabilities,
+      there are certain limitations regarding the <literal>vfio-pci</literal>
+      and <literal>igb_uio</literal> drivers. While the Enea Edge Runtime uses
+      the <literal>vfio-pci</literal> driver by default, for certain hardware
+      configurations, <literal>igb_uio</literal> should be used instead, by
+      providing custom scripting. Please contact Enea for further
+      details.</para>
+    </listitem>
+
+    <listitem>
+      <para><remark>STCR-6224</remark>The Enea Edge Automation and the Enea
+      Edge Automation Framework and Test Harness do not support multiple
+      custom scripts uploaded to a uCPE device at the same time.</para>
+    </listitem>
+
+    <listitem>
+      <para><remark>STCR-6292</remark>Management of WAN Interfaces is not
+      implemented in the Enea Edge Automation Framework and Test
+      Harness.</para>
+    </listitem>
+
+    <listitem>
+      <para><remark>USERDOCAP-628</remark>Enea Edge Automation Framework and
+      Test Harness does not have support for product features implemented in
+      Enea Edge 2.4.0 or newer.</para>
+    </listitem>
+
+    <listitem>
+      <para><remark>ELCCR-912</remark>When the Enea Edge Management
+      application is installed on CentOS 7, prior to C7.1804 (kernel version
+      3.10.0-862), adding an upgrade image fails. As a workaround, please
+      update <literal>glib2</literal> to version 2.54.2 or later, using
+      <literal>#yum update glib2</literal>.</para>
+    </listitem>
+
+    <listitem>
+      <para><remark>USERDOCAP-641</remark>Enea Edge does not have support for
+      IPv6 addresses on both uCPE devices and the Enea Edge Management
+      installation.</para>
+    </listitem>
+
+    <listitem>
+      <para><remark>USERDOCAP-651</remark>Wireless AP configuration is
+      optimized for wireless modules that use the <literal>ath10k</literal>
+      driver. Using other wireless modules may result in undefined
+      behavior.</para>
+    </listitem>
+
+    <listitem>
+      <para><remark>ELCCR-1518</remark>The Wireless AP's wpa2psk password
+      should not contain white space characters.</para>
+    </listitem>
+
+    <listitem>
+      <para><remark>ELCCR-1561</remark>Before starting an Enea Edge Management
+      upgrade, any owned Tomcat certificates should be manually copied into the 
+        <literal>/opt/ems/ucpemanager/application/3rdParty/apache-tomcat/conf/config/certificates</literal>
+      folder.</para>
+    </listitem>
+
+    <listitem>
+      <para><remark>ELCCR-1378</remark>Modifying the type of the external
+      interfaces can lead to errors. Instead of modifying, it is recommended
+      to delete the old interfaces and recreate them with the desired
+      type.</para>
+    </listitem>
+    
+    <listitem>
+      <para><remark>ELCCR-1497</remark>If the Enea Edge Management application 
+        has an incorrect database configuration, when performing an uninstallation, 
+        the Tomcat instance and Watchdog service will not be stopped automatically. 
+        Instead, they must be killed explicitly.</para>
+    </listitem>
+    
+    <listitem>
+      <para><remark>ELCCR-1468</remark>When using the Enea Edge Management
+      application in HTTPS mode, upgrading a device from NFV Access 2.3.0 is
+      not possible. Either switch to HTTP mode (for more details see <olink
+      targetdoc="book_enea_edge_getting_started"
+      targetptr="device_up_process">The uCPE device Upgrade Process in the
+      <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xpointer="element(book_enea_edge_getting_started/1)" /></olink> Manual)
+      or install it manually.</para>
+    </listitem>
+
+    <listitem condition="hidden">
+      <para><remark>LXCR-3283</remark><emphasis role="bold">PDF
+      navigation</emphasis>: When using links to open other PDFs, or jump to
+      another place in the same PDF, jumping back sometimes fails. This has
+      been observed when opening a PDF in Adobe Reader, inside a browser with
+      PDF add-on, as well as when the browser is configured to open PDF files
+      in an external PDF reader. As a workaround, open the HTML version of the
+      document.</para>
+    </listitem>
+  </itemizedlist>
+
+  <!-- The file with a section below is autocreated by make init  -->
+
+  <!-- <xi:include href="jiraissues_generated.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+</chapter>
diff --git a/doc/book-enea-edge-release-info/doc/main_changes.xml b/doc/book-enea-edge-release-info/doc/main_changes.xml
new file mode 100644
index 0000000..8824aa3
--- /dev/null
+++ b/doc/book-enea-edge-release-info/doc/main_changes.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<chapter id="relinfo-changes">
+  <title>Main Changes</title>
+
+  <para>Below you'll find information about the new features and updates made
+  in this release, as well as details on the provided packages and the
+  backwards compatibility with previous versions.</para>
+
+  <section id="relinfo-changes-other">
+    <title>New Features and Improvements</title>
+
+    <para><emphasis role="bold">New Features:</emphasis></para>
+
+    <itemizedlist>
+      <listitem>
+        <para><remark>CPDX-3496</remark>Embedded WiFi support for all-in-one
+        store/home office deployment. For more details please see the <olink
+        targetdoc="book_enea_edge_getting_started"
+        targetptr="wap_interface_type">Wap Interface Type in the <xi:include
+        href="../../s_docbuild/olinkdb/pardoc-names.xml"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_edge_getting_started/1)" /></olink>
+        Manual.</para>
+      </listitem>
+
+      <listitem>
+        <para><remark>CPDX-3499</remark>Expanded hardware, OS and network
+        monitoring capability with Grafana integration. For more details
+        please see <olink targetdoc="book_enea_edge_getting_started"
+        targetptr="grafana">Using Grafana and InfluxDB in the <xi:include
+        href="../../s_docbuild/olinkdb/pardoc-names.xml"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_edge_getting_started/1)" /></olink>
+        Manual.</para>
+      </listitem>
+
+      <listitem>
+        <para><remark>CPDX-3407</remark>HTTPS based downloads of VNFs for
+        simplified deployment of the Enea Edge Management application in cloud
+        environments. For more details please see <olink
+        targetdoc="book_enea_edge_getting_started"
+        targetptr="fresh_ucpemg_install">Fresh Installation of the Enea Edge
+        Management application in the <xi:include
+        href="../../s_docbuild/olinkdb/pardoc-names.xml"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_edge_getting_started/1)" /></olink>
+        Manual.</para>
+      </listitem>
+
+      <listitem>
+        <para><remark>CPDX-3500</remark>Enea Edge Automation, a tool for
+        automatic system configuration based on Python scripting that will
+        replace the existing Enea Edge Automation Framework and Test Harness
+        in the next major release. For more details please see the <ns:include
+        href="../../s_docbuild/olinkdb/pardoc-common.xml"
+        xmlns:ns="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_edge_automation_user_guide/1)" />.</para>
+
+        <note>
+          <para>The Enea Edge Automation Framework and Test Harness, and its
+          related documentation the <ns:include
+          href="../../s_docbuild/olinkdb/pardoc-common.xml"
+          xmlns:ns="http://www.w3.org/2001/XInclude"
+          xpointer="element(book_enea_edge_auto_fw_th_user_guide/1)" /> and
+          the <ns:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+          xmlns:ns="http://www.w3.org/2001/XInclude"
+          xpointer="element(book_enea_edge_system_test_specification/1)" />
+          are deprecated starting with Enea Edge 2.4.0.</para>
+        </note>
+      </listitem>
+    </itemizedlist>
+
+    <para><emphasis role="bold">Improvements:</emphasis></para>
+
+    <itemizedlist>
+      <listitem>
+        <para>A new <emphasis role="bold">Requirements</emphasis> page has
+        been added to the Web-installer, displaying device characteristics and
+        checking minimal hardware requirements.</para>
+      </listitem>
+
+      <listitem>
+        <para>A Web-installer's log is displayed on the last page in case the
+        installation process has failed.</para>
+      </listitem>
+
+      <listitem>
+        <para>Extended Web-installer support for NVME disks.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para><emphasis role="bold">Early Access Features:</emphasis></para>
+
+    <para>The following Early Access features are included in this
+    release:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><remark>CPDX-3498</remark>High Availability support with
+        redundant Enea Edge Management applications in active standby
+        configuration.</para>
+
+        <para>In order to increase resiliency on the uCPE management side, the
+        Enea Edge Management application can be installed in High-Availability
+        mode. Deployment consists of multiple instances of the Enea Edge
+        Management application, which can be distributed across different Data
+        Centers and geographical locations, and with multiple MariaDB servers
+        for each location.</para>
+      </listitem>
+
+      <listitem>
+        <para>Platform and VNF Snapshots (made originally available starting
+        with Enea NFV Access 2.3.0).</para>
+
+        <para>Platform Snapshots allow users to store, manage and restore
+        snapshots of the Enea Edge Runtime configuration, with the purpose of
+        recovering after a failed reconfiguration. This feature is disabled by
+        default.</para>
+
+        <para>VNF Snapshots allow users to store, manage and restore snapshots
+        of VNFs deployed on the Enea Edge Runtime, with the purpose of
+        restoring the VNF after a persistent VNF failure. This feature is
+        disabled by default.</para>
+
+        <note>
+          <para>Users that would like to try out the Early Access features
+          should contact Enea Support for additional documentation and
+          assistance.</para>
+        </note>
+      </listitem>
+    </itemizedlist>
+
+    <para>Early Access features are provided for evaluation and early
+    feedback. They are not allowed to be used for business-critical
+    deployment, unless previously approved by Enea. Support cases reported on
+    Early Access features may only be set to a Minor Priority, with the intent
+    of addressing them in upcoming GA releases.</para>
+  </section>
+
+  <section id="open_source">
+    <title>Open Source</title>
+
+    <para>For more information about the Open Source packages included, please
+    refer to the Enea Edge Open Source Reports listed below. Each report
+    contains open source and license information pertaining to packages
+    provided with this release, for their respective component.</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_edge_runtime_open_source/1)" />.</para>
+      </listitem>
+
+      <listitem>
+        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_edge_management_open_source/1)" />.</para>
+      </listitem>
+
+      <listitem>
+        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_edge_telemetry_open_source/1)" />.</para>
+      </listitem>
+
+      <listitem>
+        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_edge_automation_open_source/1)" />.</para>
+      </listitem>
+
+      <listitem>
+        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_edge_auto_fw_th_open_source/1)" />.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section id="relinfo-backward-compat">
+    <title>Compatibility</title>
+
+    <para>This release does not contain any change impacting
+    compatibility.</para>
+  </section>
+</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-release-info/doc/system_requirements_prerequisites.xml b/doc/book-enea-edge-release-info/doc/system_requirements_prerequisites.xml
index b0317b3..b0317b3 100644
--- a/doc/book-enea-nfv-access-release-info/doc/system_requirements_prerequisites.xml
+++ b/doc/book-enea-edge-release-info/doc/system_requirements_prerequisites.xml
diff --git a/doc/book-enea-nfv-access-ucpem-open-source/swcomp.mk b/doc/book-enea-edge-release-info/swcomp.mk
index 15d7a6d..892f097 100644
--- a/doc/book-enea-nfv-access-ucpem-open-source/swcomp.mk
+++ b/doc/book-enea-edge-release-info/swcomp.mk
@@ -5,6 +5,6 @@ BOOK_VER ?= $(REL_VER)-dev
 
 DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
 
-BOOKPACKAGES := book-enea-nfv-access-ucpem-open-source
-BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access uCPE Manager Open Source Report"
+BOOKPACKAGES := book-enea-edge-release-info
+BOOKDESC_$(BOOKPACKAGES) := "Enea Edge $(PROD_VER) Release Information"
 BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-platform-open-source/doc/README b/doc/book-enea-edge-runtime-open-source/doc/README
index 607ce67..607ce67 100644
--- a/doc/book-enea-nfv-access-platform-open-source/doc/README
+++ b/doc/book-enea-edge-runtime-open-source/doc/README
diff --git a/doc/book-enea-edge-runtime-open-source/doc/about.xml b/doc/book-enea-edge-runtime-open-source/doc/about.xml
new file mode 100644
index 0000000..94136a3
--- /dev/null
+++ b/doc/book-enea-edge-runtime-open-source/doc/about.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<chapter id="platform-open-source-packages-and-licenses">
+  <title>About this Report</title>
+
+  <para>This document contains the open source and license information
+  pertaining to packages relating to the Enea Edge Runtime and the Installer
+  provided with Enea Edge <ns:include
+  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+  xpointer="element(EneaLinux_REL_VER/1)"
+  xmlns:ns="http://www.w3.org/2001/XInclude" />.</para>
+</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-platform-open-source/doc/book.xml b/doc/book-enea-edge-runtime-open-source/doc/book.xml
index a17bb3d..a575375 100644
--- a/doc/book-enea-nfv-access-platform-open-source/doc/book.xml
+++ b/doc/book-enea-edge-runtime-open-source/doc/book.xml
@@ -3,8 +3,8 @@
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED">
 ]>
-<book id="book_enea_nfv_access_platform_open_source">
-  <title><trademark class="registered">Enea</trademark> NFV Access Runtime Platform Open Source Report</title>
+<book id="book_enea_edge_runtime_open_source">
+  <title><trademark class="registered">Enea</trademark> Edge Runtime Open Source Report</title>
   <subtitle>Release Version
          <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
          xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
diff --git a/doc/book-enea-nfv-access-platform-open-source/doc/licenses.xml b/doc/book-enea-edge-runtime-open-source/doc/licenses.xml
index 15af6e2..6f9aa06 100644
--- a/doc/book-enea-nfv-access-platform-open-source/doc/licenses.xml
+++ b/doc/book-enea-edge-runtime-open-source/doc/licenses.xml
@@ -44,6 +44,12 @@ specific documentation.-->
  <entry> LGPL-2.1, GPL-2.0</entry>
 </row>
 <row>
+ <entry>acpid</entry>
+ <entry>2.0.28</entry>
+ <entry>A daemon for delivering ACPI events.</entry>
+ <entry>GPL-2.0</entry>
+</row>
+<row>
  <entry>alsa-lib</entry>
  <entry>1.1.4.1</entry>
  <entry>ALSA sound library.</entry>
@@ -254,6 +260,18 @@ specific documentation.-->
  <entry>GPL-2.0</entry>
 </row>
 <row>
+ <entry>cairo</entry>
+ <entry>1.14.10</entry>
+ <entry>Cairo is a multi-platform library providing anti-aliased vector-based rendering for multiple target backends. Paths consist of line segments and cubic splines and can be rendered at any width with various join and cap styles. All colors may be specified with optional translucence (opacity/alpha) and combined using the extended Porter/Duff compositing algebra as found in the X Render Extension.</entry>
+ <entry> MPL-1.0, LGPL-2.1, GPL-3.0</entry>
+</row>
+<row>
+ <entry>cantarell-fonts</entry>
+ <entry>0.0.24</entry>
+ <entry>The Cantarell font typeface is designed as a                contemporary Humanist sans serif and was developed for                on-screen reading; in particular reading web pages on an                HTC Dream mobile phone.</entry>
+ <entry>OFL-1.1</entry>
+</row>
+<row>
  <entry>cdrkit</entry>
  <entry>1.1.11</entry>
  <entry>CD/DVD command line tools.</entry>
@@ -290,6 +308,12 @@ specific documentation.-->
  <entry>BSD</entry>
 </row>
 <row>
+ <entry>collectd</entry>
+ <entry>5.12.0</entry>
+ <entry>collectd is a daemon which collects system performance statistics periodically and provides mechanisms to store the values in a variety of ways for example in RRD files.</entry>
+ <entry> GPL-2.0, MIT</entry>
+</row>
+<row>
  <entry>commons-logging</entry>
  <entry>1.1.1</entry>
  <entry>Java Internet protocol suite library</entry>
@@ -326,6 +350,12 @@ specific documentation.-->
  <entry>GPL-3.0</entry>
 </row>
 <row>
+ <entry>crda</entry>
+ <entry>3.18</entry>
+ <entry>Wireless Central Regulatory Domain Agent.</entry>
+ <entry>copyleft-next-0.3.0</entry>
+</row>
+<row>
  <entry>cross-localedef</entry>
  <entry>2.26</entry>
  <entry>Cross locale generation tool for glibc.</entry>
@@ -508,13 +538,13 @@ specific documentation.-->
 <row>
  <entry>enea-nfv-access-vnf</entry>
  <entry>1.0</entry>
- <entry>VNF image of the Enea NFV Access Platform includes kernel rootfs and boot parameters</entry>
+ <entry>VNF image of the Enea Edge Runtime includes kernel rootfs and boot parameters</entry>
  <entry>MIT</entry>
 </row>
 <row>
  <entry>enea-nfv-access</entry>
  <entry>1.0</entry>
- <entry>Image for the host side of the Enea NFV Access Platform with ODM and NETCONF Edgelink customizations</entry>
+ <entry>Image for the host side of the Enea Edge Runtime with ODM and NETCONF Edgelink customizations</entry>
  <entry>MIT</entry>
 </row>
 <row>
@@ -872,12 +902,30 @@ specific documentation.-->
  <entry>GPL-3.0</entry>
 </row>
 <row>
+ <entry>harfbuzz</entry>
+ <entry>1.4.8</entry>
+ <entry>HarfBuzz is an OpenType text shaping engine.</entry>
+ <entry>MIT</entry>
+</row>
+<row>
+ <entry>haveged</entry>
+ <entry>1.9.1</entry>
+ <entry>The haveged project is an attempt to provide an easy-to-use unpredictable random number generator based upon an adaptation of the HAVEGE algorithm. Haveged was created to remedy low-entropy conditions in the Linux random device that can occur under some workloads especially on headless servers.</entry>
+ <entry>GPL-3.0</entry>
+</row>
+<row>
  <entry>help2man</entry>
  <entry>1.47.4</entry>
  <entry>Program for creating simple man pages.</entry>
  <entry>GPL-3.0</entry>
 </row>
 <row>
+ <entry>hostapd</entry>
+ <entry>2.9</entry>
+ <entry>User space daemon for extended IEEE 802.11 management.</entry>
+ <entry>BSD-3-Clause</entry>
+</row>
+<row>
  <entry>htop</entry>
  <entry>1.0.3</entry>
  <entry>htop process monitor.</entry>
@@ -974,6 +1022,18 @@ specific documentation.-->
  <entry>BSD</entry>
 </row>
 <row>
+ <entry>ixgbe</entry>
+ <entry>5.10.2</entry>
+ <entry>The ixgbe driver supports 82598- and 82599-based PCI Express* 10 Gigabit Network Connections.</entry>
+ <entry>GPL-2.0</entry>
+</row>
+<row>
+ <entry>ixgbevf</entry>
+ <entry>4.10.2</entry>
+ <entry>This virtual function driver supports kernel versions 2.6.x and newer This driver supports 82599 X540 X550 and X552-based virtual function devices that can only be activated on kernels that support SR-IOV. SR-IOV requires the correct platform and OS support. The guest OS loading this driver must support MSI-X interrupts.</entry>
+ <entry>GPL-2.0</entry>
+</row>
+<row>
  <entry>jacl</entry>
  <entry>1.4.1</entry>
  <entry>Tcl interpreter for Java</entry>
@@ -1160,6 +1220,12 @@ specific documentation.-->
  <entry>EPL-1.0</entry>
 </row>
 <row>
+ <entry>liberation-fonts</entry>
+ <entry>2.00.1</entry>
+ <entry>The Liberation(tm) Fonts is a font family originally created by Ascender(c) which aims at metric compatibility with Arial Times New Roman Courier New.</entry>
+ <entry>OFL-1.1</entry>
+</row>
+<row>
  <entry>libffi</entry>
  <entry>3.2.1</entry>
  <entry>The `libffi' library provides a portable high level programming interface to various calling conventions.  This allows a programmer to call any function specified by a call interface description at run time. FFI stands for Foreign Function Interface.  A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language.  The `libffi' library really only provides the lowest machine dependent layer of a fully featured foreign function interface.  A layer must exist above `libffi' that handles type conversions for values passed between the two languages.</entry>
@@ -1376,6 +1442,12 @@ specific documentation.-->
  <entry>MIT</entry>
 </row>
 <row>
+ <entry>libxft</entry>
+ <entry>2.3.2</entry>
+ <entry>Xft was designed to provide good support for scalable fonts and to do so efficiently.  Unlike the core fonts system it supports features such as anti-aliasing and sub-pixel rasterisation. Perhaps more importantly it gives applications full control over the way glyphs are rendered making fine typesetting and WYSIWIG display possible. Finally it allows applications to use fonts that are not installed system-wide for displaying documents with embedded fonts.  Xft is not compatible with the core fonts system: usage of Xft requires fairly extensive changes to toolkits (user-interface libraries).</entry>
+ <entry>MIT</entry>
+</row>
+<row>
  <entry>libxkbcommon</entry>
  <entry>0.7.1</entry>
  <entry>libxkbcommon is a keymap compiler and support library which processes a reduced subset of keymaps as defined by the XKB specification.</entry>
@@ -1418,6 +1490,12 @@ specific documentation.-->
  <entry>MIT</entry>
 </row>
 <row>
+ <entry>lighttpd</entry>
+ <entry>1.4.45</entry>
+ <entry>Lightweight high-performance web server.</entry>
+ <entry>BSD</entry>
+</row>
+<row>
  <entry>linux-firmware</entry>
  <entry>0.0</entry>
  <entry>Firmware files for use with Linux kernel.</entry>
@@ -1442,6 +1520,18 @@ specific documentation.-->
  <entry>GPL-2.0</entry>
 </row>
 <row>
+ <entry>lmsensors-config</entry>
+ <entry>1.0</entry>
+ <entry>Hardware health monitoring configuration files</entry>
+ <entry>MIT</entry>
+</row>
+<row>
+ <entry>lmsensors</entry>
+ <entry>3.6.0</entry>
+ <entry>Hardware health monitoring applications.</entry>
+ <entry> GPL-2.0, LGPL-2.1</entry>
+</row>
+<row>
  <entry>log-collector</entry>
  <entry>1.0</entry>
  <entry>Service that collects platform logs</entry>
@@ -1648,13 +1738,13 @@ specific documentation.-->
 <row>
  <entry>nfv-installer</entry>
  <entry>1.0</entry>
- <entry>Enea NFV Access installer</entry>
+ <entry>Enea Edge installer</entry>
  <entry>Enea</entry>
 </row>
 <row>
  <entry>nfva-cfgtool</entry>
  <entry>1.0</entry>
- <entry>Command line tool to for accessing the Enea NFV Access install configuration json file</entry>
+ <entry>Command line tool to for accessing the Enea Edge install configuration json file</entry>
  <entry>Enea</entry>
 </row>
 <row>
@@ -1712,6 +1802,12 @@ specific documentation.-->
  <entry>BSD</entry>
 </row>
 <row>
+ <entry>openipmi</entry>
+ <entry>2.0.24</entry>
+ <entry>OpenIPMI is an effort to create a full-function IPMI system to allow full access to all IPMI information on a server and to abstract it to a level that will make it easy to use</entry>
+ <entry> GPL-2.0, LGPL-2.1, BSD</entry>
+</row>
+<row>
  <entry>openjdk-8</entry>
  <entry>102b14</entry>
  <entry>Java runtime based upon the OpenJDK Project</entry>
@@ -1790,6 +1886,12 @@ specific documentation.-->
  <entry>MIT</entry>
 </row>
 <row>
+ <entry>packagegroup-enea-telemetry</entry>
+ <entry>1.0</entry>
+ <entry>Packages for Telemetry.</entry>
+ <entry>MIT</entry>
+</row>
+<row>
  <entry>packagegroup-enea-virtualization-4gusb-modems</entry>
  <entry>1.0</entry>
  <entry>Packagegroup for 4G usb modems.</entry>
@@ -1858,10 +1960,16 @@ specific documentation.-->
 <row>
  <entry>packagegroup-enea-wifi</entry>
  <entry>1.0</entry>
- <entry>This package group includes packages and packagegroups that enable WiFi     connectivity in the Enea NFV Access platform</entry>
+ <entry>This package group includes packages and packagegroups that enable WiFi     connectivity in the Enea Edge Runtime</entry>
  <entry>MIT</entry>
 </row>
 <row>
+ <entry>pango</entry>
+ <entry>1.40.6</entry>
+ <entry>Pango is a library for laying out and rendering of text with an emphasis on internationalization. Pango can be used anywhere that text layout is needed though most of the work on Pango so far has been done in the context of the GTK+ widget toolkit. Pango forms the core of text and font handling for GTK+-2.x.</entry>
+ <entry>LGPL-2.0</entry>
+</row>
+<row>
  <entry>parted</entry>
  <entry>3.2</entry>
  <entry>Disk partition editing/resizing utility.</entry>
@@ -2042,6 +2150,12 @@ specific documentation.-->
  <entry>MIT</entry>
 </row>
 <row>
+ <entry>python-m2crypto</entry>
+ <entry>0.26.4</entry>
+ <entry>A Python crypto and SSL toolkit.</entry>
+ <entry>BSD</entry>
+</row>
+<row>
  <entry>python-ndg-httpsclient</entry>
  <entry>0.4.3</entry>
  <entry>Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL</entry>
@@ -2168,6 +2282,12 @@ specific documentation.-->
  <entry>GPL-3.0</entry>
 </row>
 <row>
+ <entry>python-typing</entry>
+ <entry>3.6.2</entry>
+ <entry>Simple Python module defined by PEP 484..</entry>
+ <entry>Python-2.0</entry>
+</row>
+<row>
  <entry>python-urllib3</entry>
  <entry>1.22</entry>
  <entry>Python HTTP library with thread-safe connection pooling file post support sanity friendly and more.</entry>
@@ -2288,6 +2408,12 @@ specific documentation.-->
  <entry>GPL-2.0</entry>
 </row>
 <row>
+ <entry>rrdtool</entry>
+ <entry>1.6.0</entry>
+ <entry>High performance data logging and graphing system for time series data.</entry>
+ <entry>GPL-2.0</entry>
+</row>
+<row>
  <entry>rsync</entry>
  <entry>3.1.3</entry>
  <entry>File synchronization tool.</entry>
@@ -2582,6 +2708,12 @@ specific documentation.-->
  <entry>GPL-3.0</entry>
 </row>
 <row>
+ <entry>wireless-regdb</entry>
+ <entry>2020.11.20</entry>
+ <entry>Wireless Central Regulatory Domain Database.</entry>
+ <entry>ISC</entry>
+</row>
+<row>
  <entry>wpa-supplicant</entry>
  <entry>2.6</entry>
  <entry>Client for Wi-Fi Protected Access (WPA).</entry>
@@ -7874,6 +8006,303 @@ THE SOFTWARE.
 </programlisting></para></section>
 
 <section id="lic_35">
+<title>MPL-1.0</title>
+<para><programlisting>
+
+MOZILLA PUBLIC LICENSE
+Version 1.0
+
+1. Definitions.
+
+1.1. ``Contributor`` means each entity that creates or contributes to the creation of
+Modifications.
+1.2. ``Contributor Version`` means the combination of the Original Code, prior
+Modifications used by a Contributor, and the Modifications made by that particular
+Contributor.
+
+1.3. ``Covered Code`` means the Original Code or Modifications or the combination of
+the Original Code and Modifications, in each case including portions thereof.
+
+1.4. ``Electronic Distribution Mechanism`` means a mechanism generally accepted in the
+software development community for the electronic transfer of data.
+
+1.5. ``Executable`` means Covered Code in any form other than Source Code.
+
+1.6. ``Initial Developer`` means the individual or entity identified as the Initial
+Developer in the Source Code notice required by Exhibit A.
+
+1.7. ``Larger Work`` means a work which combines Covered Code or portions thereof with
+code not governed by the terms of this License.
+
+1.8. ``License`` means this document.
+
+1.9. ``Modifications`` means any addition to or deletion from the substance or
+structure of either the Original Code or any previous Modifications. When Covered Code
+is released as a series of files, a Modification is:
+
+A. Any addition to or deletion from the contents of a file containing Original Code or
+previous Modifications.
+
+B. Any new file that contains any part of the Original Code or previous Modifications.
+
+1.10. ``Original Code`` means Source Code of computer software code which is described
+in the Source Code notice required by Exhibit A as Original Code, and which, at the
+time of its release under this License is not already Covered Code governed by this
+License.
+
+1.11. ``Source Code`` means the preferred form of the Covered Code for making
+modifications to it, including all modules it contains, plus any associated interface
+definition files, scripts used to control compilation and installation of an
+Executable, or a list of source code differential comparisons against either the
+Original Code or another well known, available Covered Code of the Contributor`s
+choice. The Source Code can be in a compressed or archival form, provided the
+appropriate decompression or de-archiving software is widely available for no charge.
+
+1.12. ``You`` means an individual or a legal entity exercising rights under, and
+complying with all of the terms of, this License or a future version of this License
+issued under Section 6.1. For legal entities, ``You`` includes any entity which
+controls, is controlled by, or is under common control with You. For purposes of this
+definition, ``control`` means (a) the power, direct or indirect, to cause the
+direction or management of such entity, whether by contract or otherwise, or (b)
+ownership of fifty percent (50%) or more of the outstanding shares or beneficial
+ownership of such entity.
+
+2. Source Code License.
+2.1. The Initial Developer Grant.
+The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive
+license, subject to third party intellectual property claims:
+(a) to use, reproduce, modify, display, perform, sublicense and distribute the
+Original Code (or portions thereof) with or without Modifications, or as part of a
+Larger Work; and
+
+(b) under patents now or hereafter owned or controlled by Initial Developer, to make,
+have made, use and sell (``Utilize``) the Original Code (or portions thereof), but
+solely to the extent that any such patent is reasonably necessary to enable You to
+Utilize the Original Code (or portions thereof) and not to any greater extent that may
+be necessary to Utilize further Modifications or combinations.
+
+2.2. Contributor Grant.
+Each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license,
+subject to third party intellectual property claims:
+
+(a) to use, reproduce, modify, display, perform, sublicense and distribute the
+Modifications created by such Contributor (or portions thereof) either on an
+unmodified basis, with other Modifications, as Covered Code or as part of a Larger
+Work; and
+
+(b) under patents now or hereafter owned or controlled by Contributor, to Utilize the
+Contributor Version (or portions thereof), but solely to the extent that any such
+patent is reasonably necessary to enable You to Utilize the Contributor Version (or
+portions thereof), and not to any greater extent that may be necessary to Utilize
+further Modifications or combinations.
+
+3. Distribution Obligations.
+3.1. Application of License.
+The Modifications which You create or to which You contribute are governed by the
+terms of this License, including without limitation Section 2.2. The Source Code
+version of Covered Code may be distributed only under the terms of this License or a
+future version of this License released under Section 6.1, and You must include a copy
+of this License with every copy of the Source Code You distribute. You may not offer
+or impose any terms on any Source Code version that alters or restricts the applicable
+version of this License or the recipients` rights hereunder. However, You may include
+an additional document offering the additional rights described in Section 3.5.
+3.2. Availability of Source Code.
+Any Modification which You create or to which You contribute must be made available in
+Source Code form under the terms of this License either on the same media as an
+Executable version or via an accepted Electronic Distribution Mechanism to anyone to
+whom you made an Executable version available; and if made available via Electronic
+Distribution Mechanism, must remain available for at least twelve (12) months after
+the date it initially became available, or at least six (6) months after a subsequent
+version of that particular Modification has been made available to such recipients.
+You are responsible for ensuring that the Source Code version remains available even
+if the Electronic Distribution Mechanism is maintained by a third party.
+
+3.3. Description of Modifications.
+You must cause all Covered Code to which you contribute to contain a file documenting
+the changes You made to create that Covered Code and the date of any change. You must
+include a prominent statement that the Modification is derived, directly or
+indirectly, from Original Code provided by the Initial Developer and including the
+name of the Initial Developer in (a) the Source Code, and (b) in any notice in an
+Executable version or related documentation in which You describe the origin or
+ownership of the Covered Code.
+
+3.4. Intellectual Property Matters
+
+(a) Third Party Claims.
+If You have knowledge that a party claims an intellectual property right in particular
+functionality or code (or its utilization under this License), you must include a text
+file with the source code distribution titled ``LEGAL`` which describes the claim and
+the party making the claim in sufficient detail that a recipient will know whom to
+contact. If you obtain such knowledge after You make Your Modification available as
+described in Section 3.2, You shall promptly modify the LEGAL file in all copies You
+make available thereafter and shall take other steps (such as notifying appropriate
+mailing lists or newsgroups) reasonably calculated to inform those who received the
+Covered Code that new knowledge has been obtained.
+
+(b) Contributor APIs.
+If Your Modification is an application programming interface and You own or control
+patents which are reasonably necessary to implement that API, you must also include
+this information in the LEGAL file.
+
+3.5. Required Notices.
+You must duplicate the notice in Exhibit A in each file of the Source Code, and this
+License in any documentation for the Source Code, where You describe recipients`
+rights relating to Covered Code. If You created one or more Modification(s), You may
+add your name as a Contributor to the notice described in Exhibit A. If it is not
+possible to put such notice in a particular Source Code file due to its structure,
+then you must include such notice in a location (such as a relevant directory file)
+where a user would be likely to look for such a notice. You may choose to offer, and
+to charge a fee for, warranty, support, indemnity or liability obligations to one or
+more recipients of Covered Code. However, You may do so only on Your own behalf, and
+not on behalf of the Initial Developer or any Contributor. You must make it absolutely
+clear than any such warranty, support, indemnity or liability obligation is offered by
+You alone, and You hereby agree to indemnify the Initial Developer and every
+Contributor for any liability incurred by the Initial Developer or such Contributor as
+a result of warranty, support, indemnity or liability terms You offer.
+
+3.6. Distribution of Executable Versions.
+You may distribute Covered Code in Executable form only if the requirements of Section
+3.1-3.5 have been met for that Covered Code, and if You include a notice stating that
+the Source Code version of the Covered Code is available under the terms of this
+License, including a description of how and where You have fulfilled the obligations
+of Section 3.2. The notice must be conspicuously included in any notice in an
+Executable version, related documentation or collateral in which You describe
+recipients` rights relating to the Covered Code. You may distribute the Executable
+version of Covered Code under a license of Your choice, which may contain terms
+different from this License, provided that You are in compliance with the terms of
+this License and that the license for the Executable version does not attempt to limit
+or alter the recipient`s rights in the Source Code version from the rights set forth
+in this License. If You distribute the Executable version under a different license
+You must make it absolutely clear that any terms which differ from this License are
+offered by You alone, not by the Initial Developer or any Contributor. You hereby
+agree to indemnify the Initial Developer and every Contributor for any liability
+incurred by the Initial Developer or such Contributor as a result of any such terms
+You offer.
+
+3.7. Larger Works.
+You may create a Larger Work by combining Covered Code with other code not governed by
+the terms of this License and distribute the Larger Work as a single product. In such
+a case, You must make sure the requirements of this License are fulfilled for the
+Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+If it is impossible for You to comply with any of the terms of this License with
+respect to some or all of the Covered Code due to statute or regulation then You must:
+(a) comply with the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must be included
+in the LEGAL file described in Section 3.4 and must be included with all distributions
+of the Source Code. Except to the extent prohibited by statute or regulation, such
+description must be sufficiently detailed for a recipient of ordinary skill to be able
+to understand it.
+
+5. Application of this License.
+This License applies to code to which the Initial Developer has attached the notice in
+Exhibit A, and to related Covered Code.
+6. Versions of the License.
+6.1. New Versions.
+Netscape Communications Corporation (``Netscape``) may publish revised and/or new
+versions of the License from time to time. Each version will be given a distinguishing
+version number.
+6.2. Effect of New Versions.
+Once Covered Code has been published under a particular version of the License, You
+may always continue to use it under the terms of that version. You may also choose to
+use such Covered Code under the terms of any subsequent version of the License
+published by Netscape. No one other than Netscape has the right to modify the terms
+applicable to Covered Code created under this License.
+
+6.3. Derivative Works.
+If you create or use a modified version of this License (which you may only do in
+order to apply it to code which is not already Covered Code governed by this License),
+you must (a) rename Your license so that the phrases ``Mozilla``, ``MOZILLAPL``,
+``MOZPL``, ``Netscape``, ``NPL`` or any confusingly similar phrase do not appear
+anywhere in your license and (b) otherwise make it clear that your version of the
+license contains terms which differ from the Mozilla Public License and Netscape
+Public License. (Filling in the name of the Initial Developer, Original Code or
+Contributor in the notice described in Exhibit A shall not of themselves be deemed to
+be modifications of this License.)
+
+7. DISCLAIMER OF WARRANTY.
+COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS`` BASIS, WITHOUT WARRANTY OF
+ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT
+THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR
+NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
+INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
+SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
+PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
+THIS DISCLAIMER.
+8. TERMINATION.
+This License and the rights granted hereunder will terminate automatically if You fail
+to comply with terms herein and fail to cure such breach within 30 days of becoming
+aware of the breach. All sublicenses to the Covered Code which are properly granted
+shall survive any termination of this License. Provisions which, by their nature, must
+remain in effect beyond the termination of this License shall survive.
+9. LIMITATION OF LIABILITY.
+UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE),
+CONTRACT, OR OTHERWISE, SHALL THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY
+DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO YOU
+OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF
+ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK
+STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR
+LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH
+DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR
+PERSONAL INJURY RESULTING FROM SUCH PARTY`S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION
+OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY
+TO YOU.
+10. U.S. GOVERNMENT END USERS.
+The Covered Code is a ``commercial item,`` as that term is defined in 48 C.F.R. 2.101
+(Oct. 1995), consisting of ``commercial computer software`` and ``commercial computer
+software documentation,`` as such terms are used in 48 C.F.R. 12.212 (Sept. 1995).
+Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June
+1995), all U.S. Government End Users acquire Covered Code with only those rights set
+forth herein.
+11. MISCELLANEOUS.
+This License represents the complete agreement concerning subject matter hereof. If
+any provision of this License is held to be unenforceable, such provision shall be
+reformed only to the extent necessary to make it enforceable. This License shall be
+governed by California law provisions (except to the extent applicable law, if any,
+provides otherwise), excluding its conflict-of-law provisions. With respect to
+disputes in which at least one party is a citizen of, or an entity chartered or
+registered to do business in, the United States of America: (a) unless otherwise
+agreed in writing, all disputes relating to this License (excepting any dispute
+relating to intellectual property rights) shall be subject to final and binding
+arbitration, with the losing party paying all costs of arbitration; (b) any
+arbitration relating to this Agreement shall be held in Santa Clara County,
+California, under the auspices of JAMS/EndDispute; and (c) any litigation relating to
+this Agreement shall be subject to the jurisdiction of the Federal Courts of the
+Northern District of California, with venue lying in Santa Clara County, California,
+with the losing party responsible for costs, including without limitation, court costs
+and reasonable attorneys fees and expenses. The application of the United Nations
+Convention on Contracts for the International Sale of Goods is expressly excluded. Any
+law or regulation which provides that the language of a contract shall be construed
+against the drafter shall not apply to this License.
+12. RESPONSIBILITY FOR CLAIMS.
+Except in cases where another Contributor has failed to comply with Section 3.4, You
+are responsible for damages arising, directly or indirectly, out of Your utilization
+of rights under this License, based on the number of copies of Covered Code you made
+available, the revenues you received from utilizing such rights, and other relevant
+factors. You agree to work with affected parties to distribute responsibility on an
+equitable basis.
+EXHIBIT A.
+``The contents of this file are subject to the Mozilla Public License Version 1.0 (the
+"License"); you may not use this file except in compliance with the License. You may
+obtain a copy of the License at http://www.mozilla.org/MPL/
+Software distributed under the License is distributed on an "AS IS" basis, WITHOUT
+WARRANTY OF ANY KIND, either express or implied. See the License for the specific
+language governing rights and limitations under the License.
+
+The Original Code is ______________________________________.
+
+The Initial Developer of the Original Code is ________________________. Portions
+created by ______________________ are Copyright (C) ______ _______________________.
+All Rights Reserved.
+
+Contributor(s): ______________________________________.``
+
+</programlisting></para></section>
+
+<section id="lic_36">
 <title>MPL-2.0</title>
 <para><programlisting>
 Mozilla Public License Version 2.0
@@ -8251,7 +8680,100 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
   defined by the Mozilla Public License, v. 2.0.
 </programlisting></para></section>
 
-<section id="lic_36">
+<section id="lic_37">
+<title>OFL-1.1</title>
+<para><programlisting>
+
+SIL OPEN FONT LICENSE
+
+Version 1.1 - 26 February 2007
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION &amp; CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+
+</programlisting></para></section>
+
+<section id="lic_38">
 <title>OpenSSL</title>
 <para><programlisting>
 
@@ -8372,13 +8894,13 @@ put under another distribution licence
 
 </programlisting></para></section>
 
-<section id="lic_37">
+<section id="lic_39">
 <title>PD</title>
 <para><programlisting>
 This is a placeholder for the Public Domain License
 </programlisting></para></section>
 
-<section id="lic_38">
+<section id="lic_40">
 <title>Python-2.0</title>
 <para><programlisting>
 
@@ -8575,7 +9097,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 </programlisting></para></section>
 
-<section id="lic_39">
+<section id="lic_41">
 <title>SAX-PD</title>
 <para><programlisting>
 
@@ -8635,7 +9157,7 @@ David Megginson, Megginson Technologies Ltd.
 
 </programlisting></para></section>
 
-<section id="lic_40">
+<section id="lic_42">
 <title>SMAIL_GPL</title>
 <para><programlisting>
 This is the Debian GNU/Linux package debianutils.
@@ -8804,7 +9326,7 @@ BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR FOR ANY CLAIM BY
 ANY OTHER PARTY.
 </programlisting></para></section>
 
-<section id="lic_41">
+<section id="lic_43">
 <title>SUN</title>
 <para><programlisting>
 SUN MICROSYSTEMS, INC. THROUGH ITS SUN MICROSYSTEMS LABORATORIES
@@ -8840,7 +9362,7 @@ DIRECT DAMAGES OR ANY INDIRECT, PUNITIVE, SPECIAL, INCIDENTAL OR
 CONSEQUENTIAL DAMAGES OF ANY KIND.
 </programlisting></para></section>
 
-<section id="lic_42">
+<section id="lic_44">
 <title>Sleepycat</title>
 <para><programlisting>
 
@@ -8935,7 +9457,7 @@ SUCH DAMAGE.
 
 </programlisting></para></section>
 
-<section id="lic_43">
+<section id="lic_45">
 <title>UCB</title>
 <para><programlisting>
    Copyright (c) 1987, 1989, 1990, 1991, 1992, 1993, 1994
@@ -8966,7 +9488,7 @@ SUCH DAMAGE.
    SUCH DAMAGE.
 </programlisting></para></section>
 
-<section id="lic_44">
+<section id="lic_46">
 <title>Unicode</title>
 <para><programlisting>
 COPYRIGHT AND PERMISSION NOTICE
@@ -9008,7 +9530,7 @@ use or other dealings in these Data Files or Software without prior
 written authorization of the copyright holder.
 </programlisting></para></section>
 
-<section id="lic_45">
+<section id="lic_47">
 <title>W3C</title>
 <para><programlisting>
 
@@ -9053,7 +9575,7 @@ GPL compatibility and OSI`s certification under the Open Source Definition.
 
 </programlisting></para></section>
 
-<section id="lic_46">
+<section id="lic_48">
 <title>ZPL-2.1</title>
 <para><programlisting>
 
@@ -9094,7 +9616,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 </programlisting></para></section>
 
-<section id="lic_47">
+<section id="lic_49">
 <title>Zlib</title>
 <para><programlisting>
 
@@ -9120,7 +9642,231 @@ zlib License
 
 </programlisting></para></section>
 
-<section id="lic_48">
+<section id="lic_50">
+<title>copyleft-next-0.3.0</title>
+<para><programlisting>
+                   copyleft-next 0.3.0 ("this License")
+                         Release date: 2013-05-16
+
+1. License Grants; No Trademark License
+
+   Subject to the terms of this License, I grant You:
+
+   a) A non-exclusive, worldwide, perpetual, royalty-free, irrevocable
+      copyright license, to reproduce, Distribute, prepare derivative works
+      of, publicly perform and publicly display My Work.
+
+   b) A non-exclusive, worldwide, perpetual, royalty-free, irrevocable
+      patent license under Licensed Patents to make, have made, use, sell,
+      offer for sale, and import Covered Works.
+
+   This License does not grant any rights in My name, trademarks, service
+   marks, or logos.
+
+2. Distribution: General Conditions
+
+   You may Distribute Covered Works, provided that You (i) inform
+   recipients how they can obtain a copy of this License; (ii) satisfy the
+   applicable conditions of sections 3 through 6; and (iii) preserve all
+   Legal Notices contained in My Work (to the extent they remain
+   pertinent). "Legal Notices" means copyright notices, license notices,
+   license texts, and author attributions, but does not include logos,
+   other graphical images, trademarks or trademark legends.
+
+3. Conditions for Distributing Derived Works; Outbound GPL Compatibility
+
+   If You Distribute a Derived Work, You must license the entire Derived
+   Work as a whole under this License, with prominent notice of such
+   licensing. This condition may not be avoided through such means as
+   separate Distribution of portions of the Derived Work. You may
+   additionally license the Derived Work under the GPL, so that the
+   recipient may further Distribute the Derived Work under either this
+   License or the GPL.
+
+4. Condition Against Further Restrictions; Inbound License Compatibility
+
+   When Distributing a Covered Work, You may not impose further
+   restrictions on the exercise of rights in the Covered Work granted under
+   this License. This condition is not excused merely because such
+   restrictions result from Your compliance with conditions or obligations
+   extrinsic to this License (such as a court order or an agreement with a
+   third party).
+
+   However, You may Distribute a Covered Work incorporating material
+   governed by a license that is both OSI-Approved and FSF-Free as of the
+   release date of this License, provided that Your Distribution complies
+   with such other license.
+
+5. Conditions for Distributing Object Code
+
+   You may Distribute an Object Code form of a Covered Work, provided that
+   you accompany the Object Code with a URL through which the Corresponding
+   Source is made available, at no charge, by some standard or customary
+   means of providing network access to source code.
+
+   If you Distribute the Object Code in a physical product or tangible
+   storage medium ("Product"), the Corresponding Source must be available
+   through such URL for two years from the date of Your most recent
+   Distribution of the Object Code in the Product. However, if the Product
+   itself contains or is accompanied by the Corresponding Source (made
+   available in a customarily accessible manner), You need not also comply
+   with the first paragraph of this section.
+
+   Each recipient of the Covered Work from You is an intended third-party
+   beneficiary of this License solely as to this section 5, with the right
+   to enforce its terms.
+
+6. Symmetrical Licensing Condition for Upstream Contributions
+
+   If You Distribute a work to Me specifically for inclusion in or
+   modification of a Covered Work (a "Patch"), and no explicit licensing
+   terms apply to the Patch, You license the Patch under this License, to
+   the extent of Your copyright in the Patch. This condition does not
+   negate the other conditions of this License, if applicable to the Patch.
+
+7. Nullification of Copyleft/Proprietary Dual Licensing
+
+   If I offer to license, for a fee, a Covered Work under terms other than
+   a license that is OSI-Approved or FSF-Free as of the release date of this
+   License or a numbered version of copyleft-next released by the
+   Copyleft-Next Project, then the license I grant You under section 1 is no
+   longer subject to the conditions in sections 2 through 5.
+
+8. Copyleft Sunset
+
+   The conditions in sections 2 through 5 no longer apply once fifteen
+   years have elapsed from the date of My first Distribution of My Work
+   under this License.
+
+9. Pass-Through
+
+   When You Distribute a Covered Work, the recipient automatically receives
+   a license to My Work from Me, subject to the terms of this License.
+
+10. Termination
+
+    Your license grants under section 1 are automatically terminated if You
+
+    a) fail to comply with the conditions of this License, unless You cure
+       such noncompliance within thirty days after becoming aware of it, or
+
+    b) initiate a patent infringement litigation claim (excluding
+       declaratory judgment actions, counterclaims, and cross-claims)
+       alleging that any part of My Work directly or indirectly infringes
+       any patent.
+
+    Termination of Your license grants extends to all copies of Covered
+    Works You subsequently obtain. Termination does not terminate the
+    rights of those who have received copies or rights from You subject to
+    this License.
+
+    To the extent permission to make copies of a Covered Work is necessary
+    merely for running it, such permission is not terminable.
+
+11. Later License Versions
+
+    The Copyleft-Next Project may release new versions of copyleft-next,
+    designated by a distinguishing version number ("Later Versions").
+    Unless I explicitly remove the option of Distributing Covered Works
+    under Later Versions, You may Distribute Covered Works under any Later
+    Version.
+
+** 12. No Warranty                                                       **
+**                                                                       **
+**     My Work is provided "as-is", without warranty. You bear the risk  **
+**     of using it. To the extent permitted by applicable law, each      **
+**     Distributor of My Work excludes the implied warranties of title,  **
+**     merchantability, fitness for a particular purpose and             **
+**     non-infringement.                                                 **
+
+** 13. Limitation of Liability                                           **
+**                                                                       **
+**     To the extent permitted by applicable law, in no event will any   **
+**     Distributor of My Work be liable to You for any damages           **
+**     whatsoever, whether direct, indirect, special, incidental, or     **
+**     consequential damages, whether arising under contract, tort       **
+**     (including negligence), or otherwise, even where the Distributor  **
+**     knew or should have known about the possibility of such damages.  **
+
+14. Severability
+
+    The invalidity or unenforceability of any provision of this License
+    does not affect the validity or enforceability of the remainder of
+    this License. Such provision is to be reformed to the minimum extent
+    necessary to make it valid and enforceable.
+
+15. Definitions
+
+    "Copyleft-Next Project" means the project that maintains the source
+    code repository at &lt;https://gitorious.org/copyleft-next/&gt; as of the
+    release date of this License.
+
+    "Corresponding Source" of a Covered Work in Object Code form means (i)
+    the Source Code form of the Covered Work; (ii) all scripts,
+    instructions and similar information that are reasonably necessary for
+    a skilled developer to generate such Object Code from the Source Code
+    provided under (i); and (iii) a list clearly identifying all Separate
+    Works (other than those provided in compliance with (ii)) that were
+    specifically used in building and (if applicable) installing the
+    Covered Work (for example, a specified proprietary compiler including
+    its version number). Corresponding Source must be machine-readable.
+
+    "Covered Work" means My Work or a Derived Work.
+
+    "Derived Work" means a work of authorship that copies from, modifies,
+    adapts, is based on, is a derivative work of, transforms, translates or
+    contains all or part of My Work, such that copyright permission is
+    required. The following are not Derived Works: (i) Mere Aggregation;
+    (ii) a mere reproduction of My Work; and (iii) if My Work fails to
+    explicitly state an expectation otherwise, a work that merely makes
+    reference to My Work.
+
+    "Distribute" means to distribute, transfer or make a copy available to
+    someone else, such that copyright permission is required.
+
+    "Distributor" means Me and anyone else who Distributes a Covered Work.
+
+    "FSF-Free" means classified as 'free' by the Free Software Foundation.
+
+    "GPL" means a version of the GNU General Public License or the GNU
+    Affero General Public License.
+
+    "I"/"Me"/"My" refers to the individual or legal entity that places My
+    Work under this License. "You"/"Your" refers to the individual or legal
+    entity exercising rights in My Work under this License. A legal entity
+    includes each entity that controls, is controlled by, or is under
+    common control with such legal entity. "Control" means (a) the power to
+    direct the actions of such legal entity, whether by contract or
+    otherwise, or (b) ownership of more than fifty percent of the
+    outstanding shares or beneficial ownership of such legal entity.
+
+    "Licensed Patents" means all patent claims licensable royalty-free by
+    Me, now or in the future, that are necessarily infringed by making,
+    using, or selling My Work, and excludes claims that would be infringed
+    only as a consequence of further modification of My Work.
+
+    "Mere Aggregation" means an aggregation of a Covered Work with a
+    Separate Work.
+
+    "My Work" means the particular work of authorship I license to You
+    under this License.
+
+    "Object Code" means any form of a work that is not Source Code.
+
+    "OSI-Approved" means approved as 'Open Source' by the Open Source
+    Initiative.
+
+    "Separate Work" means a work that is separate from and independent of a
+    particular Covered Work and is not by its nature an extension or
+    enhancement of the Covered Work, and/or a runtime library, standard
+    library or similar component that is used to generate an Object Code
+    form of a Covered Work.
+
+    "Source Code" means the preferred form of a work for making
+    modifications to it.
+</programlisting></para></section>
+
+<section id="lic_51">
 <title>tcl</title>
 <para><programlisting>
 This software is copyrighted by the Regents of the University of
@@ -9168,7 +9914,7 @@ terms specified in this license.
   </section> 
  <section id="proprietary_license">
  <title>Proprietary Licenses</title>
-<section id="lic_49">
+<section id="lic_52">
 <title>Enea</title>
 <para><programlisting>
  Copyright (C) 2006 by Enea.
diff --git a/doc/book-enea-edge-runtime-open-source/swcomp.mk b/doc/book-enea-edge-runtime-open-source/swcomp.mk
new file mode 100644
index 0000000..cec1da3
--- /dev/null
+++ b/doc/book-enea-edge-runtime-open-source/swcomp.mk
@@ -0,0 +1,10 @@
+# Component build specification
+
+# Version of THIS book
+BOOK_VER ?= $(REL_VER)-dev
+
+DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
+
+BOOKPACKAGES := book-enea-edge-runtime-open-source
+BOOKDESC_$(BOOKPACKAGES) := "Enea Edge Runtime Open Source Report"
+BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-system-test-specification/doc/book.xml b/doc/book-enea-edge-system-test-specification/doc/book.xml
index 2620554..bcc2dcd 100644
--- a/doc/book-enea-nfv-access-system-test-specification/doc/book.xml
+++ b/doc/book-enea-edge-system-test-specification/doc/book.xml
@@ -3,8 +3,8 @@
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED">
 ]>
-<book id="book_enea_nfv_access_system_test_specification">
-  <title><trademark class="registered">Enea</trademark> NFV Access System Test Specification</title>
+<book id="book_enea_edge_system_test_specification">
+  <title><trademark class="registered">Enea</trademark> Edge System Test Specification</title>
 
   <subtitle>Release Version
          <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
diff --git a/doc/book-enea-nfv-access-system-test-specification/doc/configuration.xml b/doc/book-enea-edge-system-test-specification/doc/configuration.xml
index 4345326..28a9756 100644
--- a/doc/book-enea-nfv-access-system-test-specification/doc/configuration.xml
+++ b/doc/book-enea-edge-system-test-specification/doc/configuration.xml
@@ -5,46 +5,46 @@
   <section id="test_objects">
     <title>Test Objects</title>
 
-    <para>The test objects for the Test Harness are the Enea NFV Access and
-    Enea uCPE Manager installations performed as indicated in the <olink
-    targetdoc="book_enea_nfv_access_auto_fw_th_user_guide"
+    <para>The test objects for the Test Harness are the Enea Edge Runtime and
+    the Enea Edge Management installations performed as indicated in the <olink
+    targetdoc="book_enea_edge_auto_fw_th_user_guide"
     targetptr="components">Components chapter of the <xi:include
     href="../../s_docbuild/olinkdb/pardoc-names.xml"
     xmlns:xi="http://www.w3.org/2001/XInclude"
-    xpointer="element(book_enea_nfv_access_auto_fw_th_user_guide/1)" /></olink>.</para>
+    xpointer="element(book_enea_edge_auto_fw_th_user_guide/1)" /></olink>.</para>
   </section>
 
   <section id="test_env">
     <title>Test Environment</title>
 
     <para>To set up the required Test Harness environment please refer to
-    <olink targetdoc="book_enea_nfv_access_auto_fw_th_user_guide"
+    <olink targetdoc="book_enea_edge_auto_fw_th_user_guide"
     targetptr="getting_started">Getting Started with the Automation Framework
     and Test Harness in the <xi:include
     href="../../s_docbuild/olinkdb/pardoc-names.xml"
     xmlns:xi="http://www.w3.org/2001/XInclude"
-    xpointer="element(book_enea_nfv_access_auto_fw_th_user_guide/1)" /></olink>.</para>
+    xpointer="element(book_enea_edge_auto_fw_th_user_guide/1)" /></olink>.</para>
   </section>
 
   <section id="precon_exe_steps">
     <title>Preconditions and Execution</title>
 
     <para>Please refer to section <olink
-    targetdoc="book_enea_nfv_access_auto_fw_th_user_guide"
+    targetdoc="book_enea_edge_auto_fw_th_user_guide"
     targetptr="prerequisites">Prerequisites in the <xi:include
     href="../../s_docbuild/olinkdb/pardoc-names.xml"
     xmlns:xi="http://www.w3.org/2001/XInclude"
-    xpointer="element(book_enea_nfv_access_auto_fw_th_user_guide/1)" /></olink>
-    and section <olink targetdoc="book_enea_nfv_access_auto_fw_th_user_guide"
+    xpointer="element(book_enea_edge_auto_fw_th_user_guide/1)" /></olink>
+    and section <olink targetdoc="book_enea_edge_auto_fw_th_user_guide"
     targetptr="initial_setup">Installation and Initial Setup in the
     <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
     xmlns:xi="http://www.w3.org/2001/XInclude"
-    xpointer="element(book_enea_nfv_access_auto_fw_th_user_guide/1)" /></olink>
+    xpointer="element(book_enea_edge_auto_fw_th_user_guide/1)" /></olink>
     for more details.</para>
 
     <note>
       <para>Before running any test case, make sure the uCPE device(s) needed
-      have been added to the uCPE Manager.</para>
+      have been added to the Enea Edge Management.</para>
     </note>
 
     <para>For detailed execution steps of the sample test cases included with
diff --git a/doc/book-enea-nfv-access-system-test-specification/doc/overview.xml b/doc/book-enea-edge-system-test-specification/doc/overview.xml
index 5a04673..bcdbc53 100644
--- a/doc/book-enea-nfv-access-system-test-specification/doc/overview.xml
+++ b/doc/book-enea-edge-system-test-specification/doc/overview.xml
@@ -3,7 +3,7 @@
   <title>Overview</title>
 
   <para>This document describes the Test Harness (TH) sample test cases for
-  the System Testing of Enea NFV Access, and the necessary environment setup
+  the System Testing of Enea Edge, and the necessary environment setup
   to run these tests successfully.</para>
 
   <section id="def_acro_sts">
@@ -25,10 +25,10 @@
 
         <tbody>
           <row>
-            <entry>Enea NFV Access</entry>
+            <entry>Enea Edge</entry>
 
-            <entry>The Enea NFV Access (with ODM) Runtime Platform and the
-            Enea uCPE Manager.</entry>
+            <entry>The Enea Edge Runtime and the
+            Enea Edge Management.</entry>
           </row>
         </tbody>
       </tgroup>
@@ -52,7 +52,7 @@
           <row>
             <entry>AF</entry>
 
-            <entry>Automation Framework for Enea NFV Access.</entry>
+            <entry>Automation Framework for Enea Edge.</entry>
           </row>
 
           <row>
@@ -88,11 +88,11 @@
           <row>
             <entry>TH</entry>
 
-            <entry>Test Harness for Enea NFV Access.</entry>
+            <entry>Test Harness for Enea Edge.</entry>
           </row>
 
           <row>
-            <entry>uCPE Manager</entry>
+            <entry>Enea Edge Management</entry>
 
             <entry>Enea Universal Customer Premises Equipment Manager.</entry>
           </row>
diff --git a/doc/book-enea-nfv-access-system-test-specification/doc/sample_test_cases.xml b/doc/book-enea-edge-system-test-specification/doc/sample_test_cases.xml
index f4b2fc7..9fa6bda 100644
--- a/doc/book-enea-nfv-access-system-test-specification/doc/sample_test_cases.xml
+++ b/doc/book-enea-edge-system-test-specification/doc/sample_test_cases.xml
@@ -9,14 +9,14 @@
     <title>VNF, Device and Network Smoke Test Cases</title>
 
     <para>The following is an automated test suite that acts as basic smoke
-    tests for Enea NFV Access, and as a sanity-check test suite for the AF and
+    tests for Enea Edge, and as a sanity-check test suite for the AF and
     TH.</para>
 
     <section id="onb_vnf_image">
       <title>VNF - Onboard a VNF Image</title>
 
       <para><emphasis role="bold">Description: </emphasis>Onboarding a VNF
-      Image into the uCPE Manager. For details please refer to:</para>
+      Image into the Enea Edge Management. For details please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -61,7 +61,7 @@ vnfd=&lt;VNF-Descriptor-name&gt;"</programlisting></para>
       <title>VNF - Offboard a VNF</title>
 
       <para><emphasis role="bold">Description:</emphasis> Removing a VNF
-      Descriptor from the uCPE Manager. For details please refer to:</para>
+      Descriptor from the Enea Edge Management. For details please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -74,7 +74,7 @@ vnfd=&lt;VNF-Descriptor-name&gt;"</programlisting></para>
       </itemizedlist>
 
       <para><emphasis role="bold">Precondition:</emphasis> The VNF has been
-      previously onboarded in the uCPE Manager instance.</para>
+      previously onboarded in the Enea Edge Management instance.</para>
 
       <para><emphasis role="bold">Action:</emphasis> Run the
       <filename>offboardVNF.yml</filename> Ansible Playbook with the
@@ -93,7 +93,7 @@ vnfd=&lt;VNF-Descriptor-name&gt;"</programlisting></para>
       <title>Device - Add a device</title>
 
       <para><emphasis role="bold">Description:</emphasis> Adding a uCPE device
-      to the uCPE Manager. For details please refer to:</para>
+      to the Enea Edge Management. For details please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -123,10 +123,10 @@ vnfd=&lt;VNF-Descriptor-name&gt;"</programlisting></para>
     </section>
 
     <section id="device_upload_image">
-      <title>Device - Upload a NFV Access image</title>
+      <title>Device - Upload a Edge image</title>
 
-      <para><emphasis role="bold">Description:</emphasis> Upload a NFV Access
-      image file onto the uCPE Manager. For details please refer to:</para>
+      <para><emphasis role="bold">Description:</emphasis> Upload a Edge
+      image file onto the Enea Edge Management. For details please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -172,7 +172,7 @@ A file with the same name is already uploaded.</programlisting></para>
       <title>Device - Delete Upgraded File</title>
 
       <para><emphasis role="bold">Description:</emphasis> Deleting an uploaded
-      NFV Access image file from the uCPE Manager. For details please refer
+      Edge image file from the Enea Edge Management. For details please refer
       to:</para>
 
       <itemizedlist>
@@ -186,7 +186,7 @@ A file with the same name is already uploaded.</programlisting></para>
       </itemizedlist>
 
       <para><emphasis role="bold">Preconditions:</emphasis> The image file
-      must already be uploaded onto the uCPE Manager.</para>
+      must already be uploaded onto the Enea Edge Management.</para>
 
       <para><emphasis role="bold">Action:</emphasis> Run the
       <filename>deleteUpgradeFile.yml</filename> Ansible Playbook with the
@@ -237,10 +237,10 @@ localhost                  : ok=1    changed=1    unreachable=0    failed=0</pro
     </section>
 
     <section id="dev_inst_activ">
-      <title>Device - Install and Activate a NFV Access image</title>
+      <title>Device - Install and Activate a Edge image</title>
 
       <para><emphasis role="bold">Description:</emphasis> Installing and
-      Activating a NFV Access image on a uCPE device from the uCPE Manager.
+      Activating a Edge image on a uCPE device from the Enea Edge Management.
       For details please refer to:</para>
 
       <itemizedlist>
@@ -255,13 +255,13 @@ localhost                  : ok=1    changed=1    unreachable=0    failed=0</pro
 
       <para><emphasis role="bold">Preconditions:</emphasis> <itemizedlist>
           <listitem>
-            <para>The device must be previously added to the uCPE Manager
+            <para>The device must be previously added to the Enea Edge Management
             instance.</para>
           </listitem>
 
           <listitem>
-            <para>The image file must already be uploaded onto the uCPE
-            Manager.</para>
+            <para>The image file must already be uploaded onto the Enea Edge
+            Management.</para>
           </listitem>
         </itemizedlist></para>
 
@@ -291,11 +291,11 @@ Duplicate entry - Release already installed</programlisting></para>
     </section>
 
     <section id="dev_upload_inst_activ">
-      <title>Device - Upload, Install and Activate a NFV Access image on a
+      <title>Device - Upload, Install and Activate a Edge image on a
       uCPE device</title>
 
       <para><emphasis role="bold">Description:</emphasis> Upload, install and
-      activate a NFV Access image on a uCPE device from the uCPE Manager. For
+      activate a Edge image on a uCPE device from the Enea Edge Management. For
       details please refer to:</para>
 
       <itemizedlist>
@@ -335,7 +335,7 @@ Duplicate entry - Release already installed</programlisting></para>
 
       <itemizedlist>
         <listitem>
-          <para>The device has to be previously added to the uCPE Manager
+          <para>The device has to be previously added to the Enea Edge Management
           instance.</para>
         </listitem>
 
@@ -371,7 +371,7 @@ upgrade_type=xeon_d</programlisting></para>
       <title>Device - Wait a Device</title>
 
       <para><emphasis role="bold">Description:</emphasis> Wait for a uCPE
-      device to connect to the uCPE Manager. For details please refer
+      device to connect to the Enea Edge Management. For details please refer
       to:</para>
 
       <itemizedlist>
@@ -388,7 +388,7 @@ upgrade_type=xeon_d</programlisting></para>
 
       <itemizedlist>
         <listitem>
-          <para>The device has to be previously added to the uCPE Manager
+          <para>The device has to be previously added to the Enea Edge Management
           instance.</para>
         </listitem>
 
@@ -413,7 +413,7 @@ upgrade_type=xeon_d</programlisting></para>
       <title>Device - Remove a Device</title>
 
       <para><emphasis role="bold">Description:</emphasis> Removing a uCPE
-      device from the uCPE Manager. For details please refer to:</para>
+      device from the Enea Edge Management. For details please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -429,7 +429,7 @@ upgrade_type=xeon_d</programlisting></para>
 
       <itemizedlist>
         <listitem>
-          <para>The device has to be previously added to the uCPE Manager
+          <para>The device has to be previously added to the Enea Edge Management
           instance.</para>
         </listitem>
 
@@ -472,7 +472,7 @@ upgrade_type=xeon_d</programlisting></para>
       <itemizedlist>
         <listitem>
           <para>A device must have been previously added and connected to the
-          uCPE Manager instance.</para>
+          Enea Edge Management instance.</para>
         </listitem>
 
         <listitem>
@@ -517,7 +517,7 @@ upgrade_type=xeon_d</programlisting></para>
 
       <itemizedlist>
         <listitem>
-          <para>A NIC is bound to a device in a uCPE Manager instance.</para>
+          <para>A NIC is bound to a device in a Enea Edge Management instance.</para>
         </listitem>
 
         <listitem>
@@ -556,7 +556,7 @@ upgrade_type=xeon_d</programlisting></para>
 
       <para><emphasis role="bold">Preconditions:</emphasis><itemizedlist>
           <listitem>
-            <para>A NIC is bound to a device in a uCPE Manager
+            <para>A NIC is bound to a device in a Enea Edge Management
             instance.</para>
           </listitem>
 
@@ -599,7 +599,7 @@ upgrade_type=xeon_d</programlisting></para>
 
       <para><emphasis role="bold">Preconditions:</emphasis><itemizedlist>
           <listitem>
-            <para>A Bridge exists for a device in a uCPE Manager
+            <para>A Bridge exists for a device in a Enea Edge Management
             instance.</para>
           </listitem>
 
@@ -638,8 +638,8 @@ bridge=&lt;Bridge-name&gt;"</programlisting></para>
 
       <para><emphasis role="bold">Precondition: </emphasis></para>
 
-      <para>A device must have been previously added and connected to the uCPE
-      Manager instance.</para>
+      <para>A device must have been previously added and connected to the Enea Edge
+      Management instance.</para>
 
       <para><emphasis role="bold">Action:</emphasis> Run the
       <filename>configDPDK.yml</filename> Ansible Playbook with the
@@ -657,11 +657,11 @@ DEBUG: Set DPDK state to &lt;enable/disable&gt;</programlisting><emphasis
     </section>
 
     <section id="cs_upload">
-      <title>Custom Scripts - Upload a Custom Script to the uCPE
-      Manager</title>
+      <title>Custom Scripts - Upload a Custom Script to the Enea Edge
+      Management</title>
 
       <para><emphasis role="bold">Description:</emphasis> Upload a Custom
-      Script to the uCPE Manager. For details please refer to:</para>
+      Script to the Enea Edge Management. For details please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -689,15 +689,15 @@ phase=
       run using the Test Harness:</para>
 
       <programlisting># Upload Custom Script task result
-DEBUG: "{{ scriptName }} was uploaded to uCPE Manager!"</programlisting>
+DEBUG: "{{ scriptName }} was uploaded to Enea Edge Management!"</programlisting>
     </section>
 
     <section id="cs_upload_device">
-      <title>Custom Scripts - Upload a Custom Script from the uCPE Manager to
+      <title>Custom Scripts - Upload a Custom Script from the Enea Edge Management to
       a Device</title>
 
       <para><emphasis role="bold">Description:</emphasis> Upload a Custom
-      Script from the uCPE Manager to a Device. For details please refer
+      Script from the Enea Edge Management to a Device. For details please refer
       to:</para>
 
       <itemizedlist>
@@ -715,12 +715,12 @@ DEBUG: "{{ scriptName }} was uploaded to uCPE Manager!"</programlisting>
       <itemizedlist>
         <listitem>
           <para>A device must have been previously added and connected to the
-          uCPE Manager instance.</para>
+          Enea Edge Management instance.</para>
         </listitem>
 
         <listitem>
-          <para>A Custom Script must have been previously added to the uCPE
-          Manager instance.</para>
+          <para>A Custom Script must have been previously added to the Enea Edge
+          Management instance.</para>
         </listitem>
       </itemizedlist>
 
@@ -741,11 +741,11 @@ DEBUG: "{{ scriptName }} was uploaded to {{ device }}!"</programlisting>
     </section>
 
     <section id="cs_remove">
-      <title>Custom Scripts - Remove a Custom Script from the uCPE
-      Manager</title>
+      <title>Custom Scripts - Remove a Custom Script from the Enea Edge
+      Management</title>
 
       <para><emphasis role="bold">Description:</emphasis> Remove a Custom
-      Script from the uCPE Manager. For details please refer to:</para>
+      Script from the Enea Edge Management. For details please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -759,8 +759,8 @@ DEBUG: "{{ scriptName }} was uploaded to {{ device }}!"</programlisting>
 
       <para><emphasis role="bold">Precondition:</emphasis></para>
 
-      <para>A Custom Script must have been previously added to the uCPE
-      Manager.</para>
+      <para>A Custom Script must have been previously added to the Enea Edge
+      Management.</para>
 
       <para><emphasis role="bold">Action:</emphasis> Run the
       <filename>removeCustomScript.yml</filename> Ansible Playbook with the
@@ -772,8 +772,8 @@ phase=
       <para><emphasis role="bold">Result:</emphasis> Output of the test case
       run using the Test Harness:</para>
 
-      <programlisting># Remove Custom Script in phase from uCPE Manager task result
-DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from uCPE Manager!"</programlisting>
+      <programlisting># Remove Custom Script in phase from Enea Edge Management task result
+DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from Enea Edge Management!"</programlisting>
     </section>
 
     <section id="cs_remove_device">
@@ -797,7 +797,7 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from uCPE Manager!"<
       <itemizedlist>
         <listitem>
           <para>A device must have been previously added and connected to the
-          uCPE Manager instance.</para>
+          Enea Edge Management instance.</para>
         </listitem>
 
         <listitem>
@@ -827,7 +827,7 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"<
       Store</title>
 
       <para><emphasis role="bold">Description:</emphasis> Adding an Offline
-      Config Store to the uCPE Manager. For details please refer to:</para>
+      Config Store to the Enea Edge Management. For details please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -842,7 +842,7 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"<
       <para><emphasis role="bold">Precondition:</emphasis><itemizedlist>
           <listitem>
             <para>The Offline Configuration Store should not already exist on
-            the uCPE Manager. If it exists, the test will report a
+            the Enea Edge Management. If it exists, the test will report a
             duplicate.</para>
           </listitem>
 
@@ -872,7 +872,7 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"<
       Store</title>
 
       <para><emphasis role="bold">Description:</emphasis> Removing an Offline
-      Config Store from the uCPE Manager. For details please refer to:</para>
+      Config Store from the Enea Edge Management. For details please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -887,7 +887,7 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"<
       <para><emphasis role="bold">Precondition:</emphasis></para>
 
       <para>The Offline Configuration Store the user wishes to remove should
-      exist in the uCPE Manager. If it does not, the test will say so.</para>
+      exist in the Enea Edge Management. If it does not, the test will say so.</para>
 
       <para><emphasis role="bold">Action:</emphasis> Run the
       <filename>removeConfigStore.yml</filename> Ansible Playbook with the
@@ -908,7 +908,7 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"<
       Configuration Store</title>
 
       <para><emphasis role="bold">Description:</emphasis> Adding a network
-      bridge to an Offline Config Store in uCPE Manager. For details please
+      bridge to an Offline Config Store in Enea Edge Management. For details please
       refer to:</para>
 
       <itemizedlist>
@@ -925,8 +925,8 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"<
 
       <itemizedlist>
         <listitem>
-          <para>The Offline Configuration Store should exist in the uCPE
-          Manager. If it does not, the test will say so.</para>
+          <para>The Offline Configuration Store should exist in the Enea Edge
+          Management. If it does not, the test will say so.</para>
         </listitem>
 
         <listitem>
@@ -980,8 +980,8 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"<
 
       <para><emphasis role="bold">Precondition:</emphasis></para>
 
-      <para>An empty Offline Configuration Store should exist in uCPE
-      Manager.</para>
+      <para>An empty Offline Configuration Store should exist in Enea Edge
+      Management.</para>
 
       <para><emphasis role="bold">Action:</emphasis> Run the
       <filename>configOfflineDPDK.yml</filename> Ansible Playbook with the
@@ -1022,12 +1022,12 @@ INFO: Done</programlisting>
 
       <itemizedlist>
         <listitem>
-          <para>The Offline Configuration Store should exist in the uCPE
-          Manager.</para>
+          <para>The Offline Configuration Store should exist in the Enea Edge
+          Management.</para>
         </listitem>
 
         <listitem>
-          <para>The device should be connected to the uCPE Manager.</para>
+          <para>The device should be connected to the Enea Edge Management.</para>
         </listitem>
       </itemizedlist>
 
@@ -1078,7 +1078,7 @@ INFO: Done</programlisting>
         </listitem>
 
         <listitem>
-          <para>The device should be connected to the uCPE Manager.</para>
+          <para>The device should be connected to the Enea Edge Management.</para>
         </listitem>
       </itemizedlist>
 
@@ -1109,8 +1109,7 @@ INFO: Done</programlisting>
     <title>VNF Deployment and Lifecycle</title>
 
     <para>The following details the automated suite that handles the testing
-    of the instantiation, lifecycle and destruction of a VNF for Enea NFV
-    Access.</para>
+    of the instantiation, lifecycle and destruction of a VNF for Enea Edge.</para>
 
     <section id="inst_vnfi">
       <title>Instantiating a VNFI</title>
@@ -1131,7 +1130,7 @@ INFO: Done</programlisting>
       <para><emphasis role="bold">Preconditions:</emphasis> <itemizedlist>
           <listitem>
             <para>A VNF Image is onboarded and a device is added and connected
-            to the uCPE Manager. Depending on the VNF, other steps may be
+            to the Enea Edge Management. Depending on the VNF, other steps may be
             required.</para>
           </listitem>
 
@@ -1250,8 +1249,8 @@ vnfi=&lt;VNFI-name&gt;"</programlisting><emphasis
         </listitem>
 
         <listitem>
-          <para>Wait for the uCPE device to be connected in the Enea uCPE
-          Manager.</para>
+          <para>Wait for the uCPE device to be connected in the Enea Edge
+          Management.</para>
         </listitem>
 
         <listitem>
@@ -1272,7 +1271,7 @@ vnfi=&lt;VNFI-name&gt;"</programlisting><emphasis
 
         <listitem>
           <para>Instantiate the FortiGate VNF using the basic Firewall
-          configuration provided with your Enea NFV Access Release, and the
+          configuration provided with your Enea Edge Release, and the
           Fortigate License file.</para>
 
           <note>
@@ -1283,11 +1282,11 @@ vnfi=&lt;VNFI-name&gt;"</programlisting><emphasis
       </orderedlist>
 
       <para>For more information please refer to section <olink
-      targetdoc="book_enea_nfv_access_example_usecases"
+      targetdoc="book_enea_edge_example_usecases"
       targetptr="fortigate_firewall_uc_1">FortiGate VNF as a Firewall in the
       <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
       xmlns:xi="http://www.w3.org/2001/XInclude"
-      xpointer="element(book_enea_nfv_access_example_usecases/1)" /></olink>
+      xpointer="element(book_enea_edge_example_usecases/1)" /></olink>
       Manual.</para>
 
       <section id="fortigate_fw_instance">
@@ -1323,7 +1322,7 @@ vnfi=&lt;VNFI-name&gt;"</programlisting><emphasis
         <itemizedlist>
           <listitem>
             <para>A device must have been previously added and connected to
-            the uCPE Manager instance.</para>
+            the Enea Edge Management instance.</para>
           </listitem>
 
           <listitem>
@@ -1391,11 +1390,11 @@ ansible_user=root ansible_pass=root</programlisting></para>
             <filename>fortigateLicense.lic</filename>.</para>
 
             <para>For more information please refer to section <olink
-            targetdoc="book_enea_nfv_access_example_usecases"
+            targetdoc="book_enea_edge_example_usecases"
             targetptr="fortigate_firewall_uc_1">FortiGate VNF as a Firewall in
             the <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
             xmlns:xi="http://www.w3.org/2001/XInclude"
-            xpointer="element(book_enea_nfv_access_example_usecases/1)" /></olink>
+            xpointer="element(book_enea_edge_example_usecases/1)" /></olink>
             Manual.</para>
           </listitem>
         </itemizedlist>
@@ -1447,7 +1446,7 @@ FortigateFWInstance tested successfully!</programlisting></para>
         <itemizedlist>
           <listitem>
             <para>A device must have been previously added and connected to
-            the uCPE Manager instance.</para>
+            the Enea Edge Management instance.</para>
           </listitem>
 
           <listitem>
@@ -1498,22 +1497,22 @@ FortigateFWInstance tested successfully!</programlisting></para>
 
             <itemizedlist>
               <listitem>
-                <para><olink targetdoc="book_enea_nfv_access_example_usecases"
+                <para><olink targetdoc="book_enea_edge_example_usecases"
                 targetptr="fortigate_firewall_uc_1">FortiGate VNF as a
-                Firewall in the <ns:include
+                Firewall in the <xi:include
                 href="../../s_docbuild/olinkdb/pardoc-names.xml"
-                xpointer="element(book_enea_nfv_access_example_usecases/1)"
-                xmlns:ns="http://www.w3.org/2001/XInclude" /></olink>
+                xmlns:xi="http://www.w3.org/2001/XInclude"
+                xpointer="element(book_enea_edge_example_usecases/1)" /></olink>
                 Manual.</para>
               </listitem>
 
               <listitem>
                 <para><olink
-                targetdoc="book_enea_nfv_access_auto_fw_th_user_guide"
+                targetdoc="book_enea_edge_auto_fw_th_user_guide"
                 targetptr="python_testsuite">Python Unit-Test Suite in
-                <ns:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
-                xpointer="element(book_enea_nfv_access_auto_fw_th_user_guide/1)"
-                xmlns:ns="http://www.w3.org/2001/XInclude" /></olink>.</para>
+                <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
+                xmlns:xi="http://www.w3.org/2001/XInclude"
+                xpointer="element(book_enea_edge_auto_fw_th_user_guide/1)" /></olink>.</para>
               </listitem>
             </itemizedlist>
           </listitem>
@@ -1542,7 +1541,7 @@ FortigateFW Scenario deployed successfully!</programlisting></para>
 
       <para><emphasis role="bold">Description:</emphasis> This sample test
       case corresponds to the "VNF Chaining Example Use-case" from the Enea
-      NFV Access Example Use-cases manual.</para>
+      Edge Example Use-cases manual.</para>
 
       <para>For details please refer to:</para>
 
@@ -1565,7 +1564,7 @@ FortigateFW Scenario deployed successfully!</programlisting></para>
       <itemizedlist>
         <listitem>
           <para>Two devices must have been previously added and connected to
-          the uCPE Manager instance.</para>
+          the Enea Edge Management instance.</para>
         </listitem>
 
         <listitem>
@@ -1683,12 +1682,12 @@ ansible_pass=root</programlisting></para>
           directory.</para>
 
           <para>Please refer to the Chapter concerning the <olink
-          targetdoc="book_enea_nfv_access_example_usecases"
+          targetdoc="book_enea_edge_example_usecases"
           targetptr="vnf_chaining">VNF Chaining Example Use-case in the
           <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
           xmlns:xi="http://www.w3.org/2001/XInclude"
-          xpointer="element(book_enea_nfv_access_example_usecases/1)" /></olink>
-          manual for additional information about preconditions.</para>
+          xpointer="element(book_enea_edge_example_usecases/1)" /></olink>
+          Manual for additional information about preconditions.</para>
         </listitem>
       </itemizedlist>
 
@@ -1714,4 +1713,92 @@ LAN-to-LAN connectivity (through VPN tunnel)tested successfully!</programlisting
 -e "site1=inteld1521-1 site2=inteld1521-2 arch=XeonD"</programlisting></para>
     </section>
   </section>
+
+  <section id="custom_scripts_bt">
+    <title>Custom Scripts - Basic Test</title>
+
+    <para>The basic test script can be found in
+    <literal>&lt;AF-TH-install-dir&gt;/playbooks/customScripts/basicTest.yml</literal>.</para>
+
+    <para>The <filename>basicTest.yml</filename> script requires the following
+    steps:</para>
+
+    <orderedlist spacing="compact">
+      <listitem>
+        <para>Upload a Custom Script onto the Enea Edge Management.</para>
+      </listitem>
+
+      <listitem>
+        <para>Upload the Custom Script onto a Device.</para>
+      </listitem>
+
+      <listitem>
+        <para>Reboot the Device.</para>
+      </listitem>
+
+      <listitem>
+        <para>Wait for the Device to be up and running.</para>
+      </listitem>
+
+      <listitem>
+        <para>Remove the Custom Script from the Device.</para>
+      </listitem>
+
+      <listitem>
+        <para>Remove the Custom Script from the Enea Edge Management.</para>
+      </listitem>
+    </orderedlist>
+
+    <para><emphasis role="bold">Preconditions:</emphasis></para>
+
+    <itemizedlist>
+      <listitem>
+        <para>A device must have been previously added and connected to the
+        Enea Edge Management.</para>
+      </listitem>
+
+      <listitem>
+        <para>The device JSON configuration file must have been created:
+        <filename>&lt;AF-TH-install-dir&gt;/lab_config/&lt;Device-name&gt;/&lt;Device-name&gt;.json</filename>.</para>
+      </listitem>
+
+      <listitem>
+        <para>The custom script should have been previously saved in 
+          <literal>&lt;AF-TH-install-dir&gt;/lab_config/customScripts</literal>.</para>
+      </listitem>
+      
+      <listitem>
+        <para>Add device settings in the <literal>hosts</literal> Ansible inventory file under 
+          <literal>[customScriptDevice]</literal> and remove the <literal>inteld1521-1</literal>
+          example.</para>
+      </listitem>
+    </itemizedlist>
+    
+    <para><emphasis role="bold">Example:</emphasis></para>
+    
+    <programlisting>[customScriptDevice]
+inteld1521-1 ansible_host=172.24.12.73 ansible_port=22 ansible_user=root \
+      ansible_pass=root</programlisting>
+    
+    <para><emphasis role="bold">Action:</emphasis> Run
+    <filename>basicTest.yml</filename> (example data for
+    <filename>test_success_after_always</filename>):</para>
+
+    <programlisting>ansible-playbook playbooks/customScripts/basicTest.yml -e "device=&lt;Device-name&gt;" \
+-e "scriptName=test_success_after_always" -e "phase=always-after-startup" \
+-e "expectedStatus=success"</programlisting>
+
+    <para><emphasis role="bold">Result:</emphasis> Output of
+    <filename>basicTest.yml</filename>:</para>
+
+    <programlisting>test_success_after_always was uploaded to Enea Edge Management!
+test_success_after_always was uploaded to &lt;Device-name&gt;!
+
+&lt;Device-name&gt; device is connected!
+test_success_after_always from phase always-after-startup was removed \
+from &lt;Device-name&gt;!
+
+test_success_after_always from phase always-after-startup was removed \
+from Enea Edge Management!</programlisting>
+  </section>
 </chapter>
\ No newline at end of file
diff --git a/doc/book-enea-edge-system-test-specification/swcomp.mk b/doc/book-enea-edge-system-test-specification/swcomp.mk
new file mode 100755
index 0000000..2830cc3
--- /dev/null
+++ b/doc/book-enea-edge-system-test-specification/swcomp.mk
@@ -0,0 +1,10 @@
+# Component build specification
+
+# Version of THIS book
+BOOK_VER ?= $(REL_VER)-dev
+
+DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
+
+BOOKPACKAGES := book-enea-edge-system-test-specification
+BOOKDESC_$(BOOKPACKAGES) := "Enea Edge $(PROD_VER) System Test Specification"
+BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-edge-telemetry-open-source/doc/README b/doc/book-enea-edge-telemetry-open-source/doc/README
new file mode 100644
index 0000000..1077acb
--- /dev/null
+++ b/doc/book-enea-edge-telemetry-open-source/doc/README
@@ -0,0 +1,4 @@
+The licenses.xml in the git repository of Enea NFV Access Open Source Report
+is the frozen version belonging to the last official release of Enea NFV Access.
+The contents must be generated from the release script to obtain the latest
+lists of packages and licenses.
diff --git a/doc/book-enea-edge-telemetry-open-source/doc/about.xml b/doc/book-enea-edge-telemetry-open-source/doc/about.xml
new file mode 100644
index 0000000..443bf36
--- /dev/null
+++ b/doc/book-enea-edge-telemetry-open-source/doc/about.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<chapter id="telemetry-open-source-packages-and-licenses">
+  <title>About this Report</title>
+
+  <para>This document contains the open source and license information
+  pertaining to Telemetry packages provided with Enea Edge <xi:include
+  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xpointer="element(EneaLinux_REL_VER/1)" />.</para>
+</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-edge-telemetry-open-source/doc/book.xml b/doc/book-enea-edge-telemetry-open-source/doc/book.xml
new file mode 100644
index 0000000..9b0aa33
--- /dev/null
+++ b/doc/book-enea-edge-telemetry-open-source/doc/book.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED">
+]>
+<book id="book_enea_edge_telemetry_open_source">
+  <title><trademark class="registered">Enea</trademark> Edge Telemetry Open Source Report</title>
+  <subtitle>Release Version
+         <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
+         xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
+  <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
+  <xi:include href="../../s_docbuild/template/docsrc_common/bookinfo_userdoc.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+  <xi:include href="about.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+  <xi:include href="licenses.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</book>
diff --git a/doc/book-enea-edge-telemetry-open-source/doc/licenses.xml b/doc/book-enea-edge-telemetry-open-source/doc/licenses.xml
new file mode 100644
index 0000000..3cffaae
--- /dev/null
+++ b/doc/book-enea-edge-telemetry-open-source/doc/licenses.xml
@@ -0,0 +1,290 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<chapter id="telemetry_packages">
+    <title>Packages and Licenses</title>
+    <section id="telemetry_licenses_packages">
+
+        <title>Packages</title>
+
+
+        <!--This chapter contains a generated list of all packages that Enea Linux
+      supports, e.g. busybox, with a short explanatory blurb and links to package
+      specific documentation.-->
+
+        <informaltable>
+            <tgroup cols="4">
+                <colspec colwidth="2*"/>
+                <colspec colwidth="1*"/>
+                <colspec colwidth="5*"/>
+                <colspec colwidth="2*"/>
+
+
+                <thead>
+                    <row>
+                        <entry align="center">Package Name</entry>
+                        <entry align="center">Version</entry>
+                        <entry align="center">Description</entry>
+                        <entry align="center">License</entry>
+
+                    </row>
+                </thead>
+
+                <tbody valign="top">
+
+    <row>
+        <entry><ulink url="https://www.influxdata.com/products/influxdb/">InfluxDB</ulink></entry>
+        <entry>1.3.7</entry>
+        <entry>InfluxDB database for Telemetry</entry>
+        <entry><ulink url="https://github.com/influxdata/influxdb/blob/master/LICENSE">MIT License</ulink></entry>
+    </row>
+
+    <row>
+        <entry><ulink url="https://grafana.com/grafana/">Grafana</ulink></entry>
+        <entry>4.6.3</entry>
+        <entry>Analytics and interactive visualization web application</entry>
+        <entry><ulink url="https://github.com/grafana/grafana/blob/master/LICENSE">Apache License 2.0</ulink></entry>
+    </row>
+
+                </tbody>
+            </tgroup>
+        </informaltable>
+    </section>
+
+    <section id="telemetry_open_source_license">
+        <title>Open Source Licenses</title>
+
+        <section id="telemetry_lic_0">
+            <title>InfluxDB</title>
+            <para><programlisting>
+  MIT License
+  
+  Copyright (c) 2018 InfluxData
+  
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+  
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+            </programlisting></para></section>
+
+        <section id="telemetry_lic_1">
+            <title>Grafana</title>
+            <para><programlisting>
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2015 Grafana Labs
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+            </programlisting></para></section>
+  </section>
+</chapter>
diff --git a/doc/book-enea-edge-telemetry-open-source/swcomp.mk b/doc/book-enea-edge-telemetry-open-source/swcomp.mk
new file mode 100644
index 0000000..cf28954
--- /dev/null
+++ b/doc/book-enea-edge-telemetry-open-source/swcomp.mk
@@ -0,0 +1,10 @@
+# Component build specification
+
+# Version of THIS book
+BOOK_VER ?= $(REL_VER)-dev
+
+DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
+
+BOOKPACKAGES := book-enea-edge-telemetry-open-source
+BOOKDESC_$(BOOKPACKAGES) := "Enea Edge Telemetry Open Source Report"
+BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/README b/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/README
deleted file mode 100644
index e546e6f..0000000
--- a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/README
+++ /dev/null
@@ -1,3 +0,0 @@
-The licenses.xml in the git repository of Enea NFV Access AFTH Open Source Report
-is the frozen version belonging to the last official release of Enea NFV Access.
-
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/components.xml b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/components.xml
deleted file mode 100644
index 9b775a7..0000000
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/components.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<chapter id="components">
-  <title>Components</title>
-
-  <para>An overview of the Enea NFV Access Runtime Platform and the uCPE
-  Manager in cooperation with the Automation Framework and Test Harness, will
-  be presented in detail.</para>
-
-  <figure>
-    <title>Component Overview</title>
-
-    <mediaobject>
-      <imageobject>
-        <imagedata align="center" contentwidth="600"
-                   fileref="images/autofw_testh_overview.png" />
-      </imageobject>
-    </mediaobject>
-  </figure>
-
-  <section id="enfva_runtime_plt">
-    <title>Enea NFV Access</title>
-
-    <para>Enea NFV Access is comprised of the Enea uCPE Manager and the Enea
-    NFV Access Runtime Platform.</para>
-
-    <section id="eucpe_manager">
-      <title>Enea uCPE Manager</title>
-
-      <para>The Enea uCPE Manager application needs to be installed on a
-      supported platform. Upon installation, the system will be set up to
-      manage Enea NFV Access "devices", these are the virtualized CPE devices
-      used in testing.</para>
-
-      <para>For more on Enea uCPE Manager installation instructions, please
-      refer to the section on how to <olink
-      targetdoc="book_enea_nfv_access_getting_started"
-      targetptr="install_ucpe_mg">Installing the Enea uCPE Manager in the
-      <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
-      Manual.</para>
-    </section>
-
-    <section id="ena_plat">
-      <title>Enea NFV Access Runtime Platform</title>
-
-      <para>One or more uCPE devices running the Enea NFV Access Runtime
-      Platform are required as hosts to run the VNF(s). The uCPE device is
-      known to the uCPE Manager as the "VcpeAgent" device module.</para>
-
-      <note>
-        <para>Before running any use case with the Automation Framework or the
-        Test Harness, make sure the uCPE device(s) have been added to the uCPE
-        Manager.</para>
-      </note>
-
-      <para>Adding a VcpeAgent device can be done via two methods:</para>
-
-      <itemizedlist>
-        <listitem>
-          <para>Through the uCPE Manager GUI. Add the device using the
-          appropriate parameters by launching the UI under
-          <literal>Devices</literal> -&gt; <literal>Manage</literal> in the
-          main screen.</para>
-        </listitem>
-
-        <listitem>
-          <para>REST API. Invoke the uCPE Manager REST API to add a
-          device.</para>
-        </listitem>
-      </itemizedlist>
-
-      <para>For more on Enea NFV Access installation instructions, please
-      refer to chapter <olink targetdoc="book_enea_nfv_access_getting_started"
-      targetptr="prep_usb_ena">Preparing the USB stick for installation of the
-      Enea NFV Access Runtime Platform in the <xi:include
-      href="../../s_docbuild/olinkdb/pardoc-names.xml"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
-      Manual.</para>
-    </section>
-  </section>
-
-  <section id="automation">
-    <title>Automation Framework</title>
-
-    <para>Testing can be performed by running the available Python scripts
-    against the uCPE Manager REST API (Python samples supplied). This can be
-    done by using the Python scripts individually or by using the Python
-    unit-test suite that is able to automatically run test-cases defined for
-    each available Python script.</para>
-
-    <para>In either case, it is desirable to use a different host (instead of
-    running the tests on the same system as the uCPE Manager) in order to
-    ensure that the uCPE Manager is setup and installed correctly in terms of
-    allowing external users to access it and use it effectively.</para>
-  </section>
-
-  <section id="harness">
-    <title>Test Harness</title>
-
-    <para>The Test Harness (TH) provides a way for driving configuration with
-    Ansible Playbooks, by running the python modules from the Automation
-    Framework (AF) and by direct connection over SSH to the boards that run
-    Enea NFV Access.</para>
-
-    <para>The Test Harness includes an automated test suite that
-    contains:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>VNF, Device and Network Smoke Test Cases. A sample test suite
-        that acts as basic smoke tests for Enea NFV Access and also as a
-        sanity-check test suite for the AF and TH.</para>
-      </listitem>
-
-      <listitem>
-        <para>VNF Deployment and Lifecycle. A sample test suite that verifies
-        the instantiation, lifecycle control and destruction of a VNF for Enea
-        NFV Access.</para>
-      </listitem>
-
-      <listitem>
-        <para>Service Creation and Lifecycle. A sample test suite that
-        contains complex test cases showcasing service creation and lifecycle
-        management.</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>For details about the test suites or test cases please refer to
-    chapter <olink targetdoc="book_enea_nfv_access_system_test_specification"
-    targetptr="sample_testcases">Sample Test Cases in the <xi:include
-    href="../../s_docbuild/olinkdb/pardoc-names.xml"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xpointer="element(book_enea_nfv_access_system_test_specification/1)" /></olink>
-    Manual.</para>
-  </section>
-</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/ChainedVNFsService_setup.png b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/ChainedVNFsService_setup.png
deleted file mode 100755
index a345989..0000000
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/ChainedVNFsService_setup.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/autofw_testh_overview.png b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/autofw_testh_overview.png
deleted file mode 100755
index a597a91..0000000
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/autofw_testh_overview.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/environment_basicsetup.png b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/environment_basicsetup.png
deleted file mode 100755
index 6bd35d4..0000000
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/environment_basicsetup.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/swcomp.mk b/doc/book-enea-nfv-access-auto-fw-th-user-guide/swcomp.mk
deleted file mode 100755
index 9f0a075..0000000
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/swcomp.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# Component build specification
-
-# Version of THIS book
-BOOK_VER ?= $(REL_VER)-dev
-
-DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
-
-BOOKPACKAGES := book-enea-nfv-access-auto-fw-th-user-guide
-BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access $(PROD_VER) Automation Framework and Test Harness User Guide"
-BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-cmc-example-usecases/doc/128t_vnf_router.xml b/doc/book-enea-nfv-access-cmc-example-usecases/doc/128t_vnf_router.xml
deleted file mode 100644
index be7efb9..0000000
--- a/doc/book-enea-nfv-access-cmc-example-usecases/doc/128t_vnf_router.xml
+++ /dev/null
@@ -1,728 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<chapter id="vnf_router_cmc_uc">
-  <title>128T VNF Router Example Use-case</title>
-
-  <para>The 128T Networking Platform (128T) natively provides network-based
-  security, control, and insight across data centers, wide-area networks
-  (WAN), and edge locations for enterprises, service providers, and cloud
-  companies alike.</para>
-
-  <section id="preq_128_router">
-    <title>Prerequisites</title>
-
-    <para>The following are needed for this example use case:</para>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>1 in band management port for device management.</para>
-      </listitem>
-
-      <listitem>
-        <para>1 in band management port for 128T VNF.</para>
-      </listitem>
-
-      <listitem>
-        <para>1 WAN interface for 128T.</para>
-      </listitem>
-
-      <listitem>
-        <para>1 LAN interface for 128T.</para>
-      </listitem>
-    </itemizedlist>
-  </section>
-
-  <section id="vnf_router_cmc">
-    <title>128T VNF Router</title>
-
-    <figure>
-      <title>128T VNF Router Setup Overview</title>
-
-      <mediaobject>
-        <imageobject>
-          <imagedata contentwidth="600" fileref="images/kontron_me1100.png" />
-        </imageobject>
-      </mediaobject>
-    </figure>
-
-    <section id="uc_setup_cmc_router">
-      <title>Use-case Setup</title>
-
-      <para><emphasis role="bold">Configuring Network Interfaces on uCPE
-      devices:</emphasis><orderedlist spacing="compact">
-          <listitem>
-            <para>Log into the uCPE Manager with both username and password
-            values: <literal>admin</literal>.</para>
-          </listitem>
-
-          <listitem>
-            <para>Add the Kontron me1100 uCPE device into the uCPE Manager:
-            <literal>Devices -&gt; Manage -&gt; Add</literal>.</para>
-
-            <para>Fill in the required fields with the following data:</para>
-
-            <table>
-              <title>Device Details</title>
-
-              <tgroup cols="2">
-                <colspec align="left" />
-
-                <colspec colwidth="2*" />
-
-                <colspec colwidth="5*" />
-
-                <thead>
-                  <row>
-                    <entry align="center">Field</entry>
-
-                    <entry align="center">Value</entry>
-                  </row>
-                </thead>
-
-                <tbody>
-                  <row>
-                    <entry>Type</entry>
-
-                    <entry>Enea universal CPE</entry>
-                  </row>
-
-                  <row>
-                    <entry>Release</entry>
-
-                    <entry>1.0</entry>
-                  </row>
-
-                  <row>
-                    <entry>Name</entry>
-
-                    <entry>me1100</entry>
-                  </row>
-
-                  <row>
-                    <entry>IP/DNS Address</entry>
-
-                    <entry>&lt;unspecified&gt;<note>
-                        <para>Please do not add the IP, it will be updated
-                        automatically by new communication protocol.</para>
-                      </note></entry>
-                  </row>
-
-                  <row>
-                    <entry>Description</entry>
-
-                    <entry>Kontron Target 1</entry>
-                  </row>
-
-                  <row>
-                    <entry>Device ID</entry>
-
-                    <entry>The value of the Device ID must be the same as the
-                    one used during the NFV Access installation.</entry>
-                  </row>
-
-                  <row>
-                    <entry>SSH Port</entry>
-
-                    <entry>830</entry>
-                  </row>
-
-                  <row>
-                    <entry>SSH User Name</entry>
-
-                    <entry>root</entry>
-                  </row>
-
-                  <row>
-                    <entry>Password</entry>
-
-                    <entry>null</entry>
-                  </row>
-
-                  <row condition="hidden">
-                    <entry>OK</entry>
-
-                    <entry>Green status indicates connection with uCPE device
-                    was established.</entry>
-                  </row>
-                </tbody>
-              </tgroup>
-            </table>
-          </listitem>
-
-          <listitem>
-            <para>Add the device on the map: Right-Click on <literal>Map -&gt;
-            Place Device -&gt; me1100</literal>.</para>
-
-            <note>
-              <para>In order for the device to connect to the uCPE Manager, it 
-                must be added to the uCPE Manager and be powered on, having the 
-                NFV Access platform started, otherwise it must be rebooted.</para>
-            </note>
-          </listitem>
-
-          <listitem>
-            <para>Configure the virtualization infrastructure for 128T VNF by
-            creating three OVS bridges and a host interface.</para>
-
-            <para>Select the me1100 device then: <literal>Configuration -&gt;
-            OpenVSwitch -&gt; Bridges -&gt; Add</literal>. Fill in the
-            required fields for each bridge with the following data from each
-            table:</para>
-
-            <table>
-              <title>ibm_br Bridge Details</title>
-
-              <tgroup cols="2">
-                <colspec align="left" />
-
-                <colspec colwidth="2*" />
-
-                <colspec colwidth="5*" />
-
-                <thead>
-                  <row>
-                    <entry align="center">Field</entry>
-
-                    <entry align="center">Value</entry>
-                  </row>
-                </thead>
-
-                <tbody>
-                  <row condition="hidden">
-                    <entry>id</entry>
-
-                    <entry>&lt;autogenerated - do not change&gt;</entry>
-                  </row>
-
-                  <row>
-                    <entry>Name</entry>
-
-                    <entry><literal>ibm_br</literal></entry>
-                  </row>
-
-                  <row>
-                    <entry>ovs-bridge-type</entry>
-
-                    <entry>inbandMgmt</entry>
-                  </row>
-
-                  <row condition="hidden">
-                    <entry>mgmt-address</entry>
-
-                    <entry>Provide the IP address of the uCPE Manager machine
-                    (E.g. 172.24.3.109).</entry>
-                  </row>
-
-                  <row condition="hidden">
-                    <entry>mgmt-port</entry>
-
-                    <entry>830</entry>
-                  </row>
-
-                  <row>
-                    <entry>Create</entry>
-
-                    <entry><para>The system will automatically select the
-                    physical interface that has access to the uCPE
-                    Manager.</para></entry>
-                  </row>
-                </tbody>
-              </tgroup>
-            </table>
-
-            <table>
-              <title>vnf_mgmt_br Bridge Details</title>
-
-              <tgroup cols="2">
-                <colspec align="left" />
-
-                <colspec colwidth="2*" />
-
-                <colspec colwidth="5*" />
-
-                <thead>
-                  <row>
-                    <entry align="center">Field</entry>
-
-                    <entry align="center">Value</entry>
-                  </row>
-                </thead>
-
-                <tbody>
-                  <row condition="hidden">
-                    <entry>id</entry>
-
-                    <entry>&lt;autogenerated - do not change&gt;</entry>
-                  </row>
-
-                  <row>
-                    <entry>Name</entry>
-
-                    <entry><literal>vnf_mgmt_br</literal></entry>
-                  </row>
-
-                  <row>
-                    <entry>ovs-bridge-type</entry>
-
-                    <entry>vnfMgmt</entry>
-                  </row>
-
-                  <row>
-                    <entry>vnf-mgmt-address</entry>
-
-                    <entry>10.0.0.1</entry>
-                  </row>
-
-                  <row>
-                    <entry>Create</entry>
-
-                    <entry></entry>
-                  </row>
-                </tbody>
-              </tgroup>
-            </table>
-
-            <table>
-              <title>lan_br Bridge Details</title>
-
-              <tgroup cols="2">
-                <colspec align="left" />
-
-                <colspec colwidth="2*" />
-
-                <colspec colwidth="5*" />
-
-                <thead>
-                  <row>
-                    <entry align="center">Field</entry>
-
-                    <entry align="center">Value</entry>
-                  </row>
-                </thead>
-
-                <tbody>
-                  <row condition="hidden">
-                    <entry>id</entry>
-
-                    <entry>&lt;autogenerated - do not change&gt;</entry>
-                  </row>
-
-                  <row>
-                    <entry>Name</entry>
-
-                    <entry><literal>lan_br</literal></entry>
-                  </row>
-
-                  <row>
-                    <entry>ovs-bridge-type</entry>
-
-                    <entry>dataPlane</entry>
-                  </row>
-
-                  <row>
-                    <entry>sub-type</entry>
-
-                    <entry>communication</entry>
-                  </row>
-
-                  <row>
-                    <entry>+</entry>
-
-                    <entry>Name: enp4s0f1 OK</entry>
-                  </row>
-
-                  <row>
-                    <entry>Create</entry>
-
-                    <entry></entry>
-                  </row>
-                </tbody>
-              </tgroup>
-            </table>
-
-            <para>Add the Host Interface by selecting the
-            <literal>me1100</literal> device, then <literal>Configuration
-            -&gt; External Interface -&gt; Configuration -&gt; Add</literal>.
-            Fill in the required fields with the following data:</para>
-
-            <table>
-              <title>Host Interface Details</title>
-
-              <tgroup cols="2">
-                <colspec align="left" />
-
-                <colspec colwidth="2*" />
-
-                <colspec colwidth="5*" />
-
-                <thead>
-                  <row>
-                    <entry align="center">Field</entry>
-
-                    <entry align="center">Value</entry>
-                  </row>
-                </thead>
-
-                <tbody>
-                  <row>
-                    <entry>Source</entry>
-
-                    <entry><literal>enp4s0f1</literal>. The only interface
-                    available for LAN connection.</entry>
-                  </row>
-
-                  <row>
-                    <entry>type</entry>
-
-                    <entry>dpdk</entry>
-                  </row>
-
-                  <row>
-                    <entry>networking-type</entry>
-
-                    <entry>dpdk</entry>
-                  </row>
-
-                  <row>
-                    <entry>dpdk-type</entry>
-
-                    <entry>vfio-pci</entry>
-                  </row>
-
-                  <row>
-                    <entry>Create</entry>
-
-                    <entry>&lt;interface enp4s0f1 ready to be used in a LAN
-                    bridge.&gt;</entry>
-                  </row>
-                </tbody>
-              </tgroup>
-            </table>
-          </listitem>
-        </orderedlist></para>
-
-      <para><emphasis role="bold">Onboarding the VNFs:</emphasis></para>
-
-      <para>Onboard the VM Image through <literal>VNF -&gt; Descriptors -&gt;
-      On-board -&gt; VM Image</literal>, and fill in the required fields with
-      the following values:</para>
-
-      <table>
-        <title>VM Image Details</title>
-
-        <tgroup cols="2">
-          <colspec align="left" />
-
-          <colspec colwidth="2*" />
-
-          <colspec colwidth="5*" />
-
-          <thead>
-            <row>
-              <entry align="center">Field</entry>
-
-              <entry align="center">Value</entry>
-            </row>
-          </thead>
-
-          <tbody>
-            <row>
-              <entry>VM image file</entry>
-
-              <entry><literal>centos_128t_with_ci.qcow2</literal></entry>
-            </row>
-
-            <row>
-              <entry>Image format</entry>
-
-              <entry>QCOW2</entry>
-            </row>
-
-            <row>
-              <entry>VNF Type Name</entry>
-
-              <entry>128T</entry>
-            </row>
-
-            <row>
-              <entry>Description</entry>
-
-              <entry>128T Router</entry>
-            </row>
-
-            <row>
-              <entry>Version</entry>
-
-              <entry>1.0</entry>
-            </row>
-
-            <row>
-              <entry>Memory in MB</entry>
-
-              <entry>8192. More memory can be allocated if required
-              (&lt;28672).</entry>
-            </row>
-
-            <row>
-              <entry>Num. of CPUs</entry>
-
-              <entry>2. More CPUs can be reserved if required
-              (&lt;15).</entry>
-            </row>
-
-            <row>
-              <entry>Interfaces -&gt; +</entry>
-
-              <entry>Name: mgmt</entry>
-            </row>
-
-            <row>
-              <entry>Interfaces -&gt; +</entry>
-
-              <entry>Name: wan</entry>
-            </row>
-
-            <row>
-              <entry>Interfaces -&gt; +</entry>
-
-              <entry>Name: lan</entry>
-            </row>
-
-            <row>
-              <entry>Cloud Init -&gt; Cloud-Init Datasource</entry>
-
-              <entry>ISO</entry>
-            </row>
-
-            <row>
-              <entry>Cloud Init -&gt; Cloud-Init Disk Type</entry>
-
-              <entry>cdrom</entry>
-            </row>
-
-            <row>
-              <entry>Properties -&gt; +</entry>
-
-              <entry>Name: vnfMgmtIpAddress. Value: 10.0.0.2</entry>
-            </row>
-
-            <row>
-              <entry>Properties -&gt; +</entry>
-
-              <entry>Name: internalMgmtPort. Value: 443</entry>
-            </row>
-
-            <row>
-              <entry>Properties -&gt; +</entry>
-
-              <entry>Name: externalMgmtPort. Value: 60001</entry>
-            </row>
-
-            <row>
-              <entry>Onboard</entry>
-
-              <entry>&lt;Wait for message: VNF package onboarded
-              successfully&gt;</entry>
-            </row>
-
-            <row>
-              <entry>Close</entry>
-
-              <entry></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-
-      <note>
-        <itemizedlist>
-          <listitem>
-            <para>HTTPS access (443) can be changed with another type of
-            access. Please consult official 128T documentation and make sure
-            the 128T VNF is configured to accept another type of connection
-            before changing the port number.</para>
-          </listitem>
-
-          <listitem>
-            <para><literal>externalMgmtPort</literal> (60001) represents the
-            external port on which the user can access the VNF management
-            interface via HTTPS. Another port can be selected if needed. There
-            are no other changes required or components affected by this
-            change.</para>
-          </listitem>
-
-          <listitem>
-            <para><literal>vnfMgmtIpAddress</literal> (10.0.0.2) represents
-            the IP address of the management interface of the 128T VNF.
-            Changing this value requires an update to the 128T configuration
-            to match the new IP address.</para>
-          </listitem>
-        </itemizedlist>
-      </note>
-
-      <para><emphasis role="bold">Instantiating the VNFs:</emphasis></para>
-
-      <para>Instantiate the 128T VNF by selecting the me1100 device, then
-      <literal>VNF -&gt; Instances -&gt; Add</literal>.</para>
-
-      <para>Fill in the required fields with the following values:</para>
-
-      <table>
-        <title>128T VNF Instantiation</title>
-
-        <tgroup cols="2">
-          <colspec align="left" />
-
-          <colspec colwidth="2*" />
-
-          <colspec colwidth="5*" />
-
-          <thead>
-            <row>
-              <entry align="center">Field</entry>
-
-              <entry align="center">Value</entry>
-            </row>
-          </thead>
-
-          <tbody>
-            <row>
-              <entry>Name</entry>
-
-              <entry>128T_me1100_1</entry>
-            </row>
-
-            <row>
-              <entry>VNF Type</entry>
-
-              <entry>128T</entry>
-            </row>
-
-            <row>
-              <entry>VNFD Version</entry>
-
-              <entry>1.0</entry>
-            </row>
-
-            <row>
-              <entry>Flavour</entry>
-
-              <entry>Canonical</entry>
-            </row>
-
-            <row>
-              <entry>uCPE Device</entry>
-
-              <entry>me1100</entry>
-            </row>
-
-            <row>
-              <entry>Cloud Init File</entry>
-
-              <entry><literal>centos_128t_internet_ci.iso</literal></entry>
-            </row>
-
-            <row>
-              <entry>Domain Update Script</entry>
-
-              <entry></entry>
-            </row>
-
-            <row>
-              <entry>Interfaces</entry>
-
-              <entry></entry>
-            </row>
-
-            <row>
-              <entry>ID</entry>
-
-              <entry>IF Name</entry>
-            </row>
-
-            <row>
-              <entry>mgmt (dpdk)</entry>
-
-              <entry>Bridge: vnf_mgmt_br</entry>
-            </row>
-
-            <row>
-              <entry>wan (dpdk)</entry>
-
-              <entry>Bridge: ibm_br</entry>
-            </row>
-
-            <row>
-              <entry>lan (dpdk)</entry>
-
-              <entry>Bridge: lan_br</entry>
-            </row>
-
-            <row>
-              <entry>Create</entry>
-
-              <entry></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-    </section>
-
-    <section id="uc_test_cmc_router">
-      <title>Testing the Use-case</title>
-
-      <para>In order to access the web interface of the 128T VNF, open a
-      browser from a machine connected on the same network with the WAN port
-      of the me1100 uCPE device and browse to:
-      <literal>https://&lt;public_me1100_WAN_IP&gt;:60001</literal>. Log in
-      using the following credentials:</para>
-
-      <itemizedlist>
-        <listitem>
-          <para>Username: admin</para>
-        </listitem>
-
-        <listitem>
-          <para>Password: 128Tadmin</para>
-        </listitem>
-      </itemizedlist>
-
-      <para>In order to validate the data path, connect a test machine to the
-      LAN physical port, assign the static IP and a route:<programlisting>&gt; ifconfig eth3 192.168.64.2 netmask 255.255.255.0
-&gt; ip route add default via 192.168.64.1  dev eth3
-&gt; ping 8.8.8.8</programlisting>For data path validation, it may be required
-      to generate a new cloud-init image to match your network configuration.
-      Please check Appendix A: How to create 128T cloud-init iso image (day-0
-      configuration), for more details.</para>
-    </section>
-
-    <section id="cleanup_cmcone">
-      <title>Use-case Clean-up</title>
-
-      <para>In order to remove the setup created previously all components
-      need to be deleted in reverse order:</para>
-
-      <orderedlist>
-        <listitem>
-          <para>Select the me1100 uCPE device -&gt; VNF -&gt; Instances -&gt;
-          128T -&gt; Delete.</para>
-        </listitem>
-
-        <listitem>
-          <para>Select the me1100 uCPE device -&gt; Configuration -&gt;
-          OpenVSwitch -&gt; Bridges. Select all bridges -&gt; Delete.</para>
-        </listitem>
-
-        <listitem>
-          <para>Select the me1100 uCPE device -&gt; Configuration -&gt;
-          OpenVSwitch -&gt; Host Interfaces. Select all interfaces -&gt;
-          Delete.</para>
-        </listitem>
-
-        <listitem>
-          <para>VNF -&gt; Descriptors, select all bundles -&gt;
-          Offboard.</para>
-        </listitem>
-      </orderedlist>
-    </section>
-  </section>
-</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-cmc-example-usecases/doc/appendix_1.xml b/doc/book-enea-nfv-access-cmc-example-usecases/doc/appendix_1.xml
deleted file mode 100644
index 023f798..0000000
--- a/doc/book-enea-nfv-access-cmc-example-usecases/doc/appendix_1.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<appendix id="appendix_one_cmc">
-  <title>How to create a 128T cloud-init iso image (day-0
-  configuration)</title>
-
-  <para><emphasis role="bold">Prerequisites:</emphasis><itemizedlist>
-      <listitem>
-        <para>Development host with Linux shell.</para>
-      </listitem>
-
-      <listitem>
-        <para><literal>genisoimage</literal> tool installed.</para>
-      </listitem>
-    </itemizedlist></para>
-
-  <para>Unpack the <filename>128T/128t-cloud-init-example.tar.gz</filename>
-  archive and check the README file for more details:</para>
-
-  <programlisting>&gt;tar -zxf 128t-cloud-init-example.tar.gz
-&gt;cd 128T/cloud-init-example/
-&gt;ls ./
-README
-user-data
-meta-data
-t128-running.xml</programlisting>
-
-  <para>To generate the cloud-init iso image:</para>
-
-  <programlisting>&gt;genisoimage -output centos_128t_ci.iso -volid cidata -joliet \
--rock user-data meta-data t128-running.xml </programlisting>
-
-  <para><emphasis role="bold">Notes: </emphasis><itemizedlist>
-      <listitem>
-        <para><literal>user-data</literal> and <literal>meta-data</literal>
-        files must be kept unchanged.</para>
-      </listitem>
-
-      <listitem>
-        <para>To update the 128T configuration change the
-        <literal>t128-runing.xml</literal> file.</para>
-      </listitem>
-
-      <listitem>
-        <para>XML is the same file downloaded from 128T web access:
-        <literal>configuration -&gt; Import and Export Configuration -&gt;
-        Export Configuration -&gt; Download Configuration</literal>. The
-        configuration can be updated from a web interface, downloaded onto the
-        development host and used in generating a new cloud-init iso
-        image.</para>
-      </listitem>
-    </itemizedlist></para>
-
-  <para>By default, <literal>t128-running.xml</literal> is configured to pass
-  all traffic from the LAN to the WAN interface. There is only one change
-  required for the 128T VNF to work on the user's network:</para>
-
-  <programlisting>&lt;rt:next-hop&gt;172.24.15.254&lt;/rt:next-hop&gt;</programlisting>
-
-  <para>Please change &lt;172.24.15.254&gt; with the IP address of your
-  Gateway in the <filename>t128-running.xml</filename> file and generate a new
-  iso image as described above. For more details about configuring the 128T
-  VNF please contact 128 Technologies.</para>
-</appendix>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-cmc-example-usecases/doc/appendix_2.xml b/doc/book-enea-nfv-access-cmc-example-usecases/doc/appendix_2.xml
deleted file mode 100644
index e3da67f..0000000
--- a/doc/book-enea-nfv-access-cmc-example-usecases/doc/appendix_2.xml
+++ /dev/null
@@ -1,326 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<appendix id="appendix_two_cmc">
-  <title>How to create the 128T image for NFV Access</title>
-
-  <para>The following steps were used by Enea to generate the 128T qcow2 image
-  used as the VNF image on NFV Access.</para>
-
-  <note>
-    <para>Follow the <filename>128tISO-Install.pdf</filename> document and
-    keep in mind a Virtual Machine was used instead of a physical host.</para>
-  </note>
-
-  <para><emphasis role="bold">Prerequisites:</emphasis><itemizedlist>
-      <listitem>
-        <para><filename>128T-3.2.7-1.el7.centos.x86_64.iso</filename> provided
-        by 128 Technologies.</para>
-      </listitem>
-
-      <listitem>
-        <para>A Linux development host with internet access.</para>
-      </listitem>
-
-      <listitem>
-        <para>A least one of the TAP interfaces connected to a bridge with
-        Internet access.</para>
-      </listitem>
-    </itemizedlist><emphasis role="bold">How to create the 128T image for NFV
-  Access:</emphasis><orderedlist>
-      <listitem>
-        <programlisting>&gt;qemu-img create -f qcow2 128t.qcow2  128G
-&gt;qemu-system-x86_64 -enable-kvm -m 8G -cpu host -smp cores=3,sockets=1 \
--M q35 -nographic bios /usr/share/qemu/bios.bin -boot order=d,menu=on \
-cdrom 128T-3.2.7-1.el7.centos.x86_64.iso \
-hdb 128t.qcow2 \
-device e1000,netdev=net1,mac=52:52:01:02:03:01 \
-netdev tap,id=net1,ifname=tap1,script=no,downscript=no</programlisting>
-      </listitem>
-
-      <listitem>
-        <para>Press the &lt;ENTER&gt; key to begin the installation
-        process.</para>
-      </listitem>
-
-      <listitem>
-        <para>Wait for the distribution and the 128T to install:</para>
-
-        <programlisting>------------------------------
-128T Packages Installed       
-                              
-Please Remove Install Media,  
-                              
-then enter &lt;Yes&gt; to reboot and
-continue install process      
-                              
-      &lt;Yes&gt;          &lt;No&gt;     
-------------------------------</programlisting>
-
-        <para>Press Yes.</para>
-      </listitem>
-
-      <listitem>
-        <para>Wait to reboot and press <literal>CTR+ a+c</literal> to enter
-        the qemu monitor:</para>
-
-        <programlisting>(qemu) quit</programlisting>
-      </listitem>
-
-      <listitem>
-        <para>Start qemu only with the qcow2 image attached, no installer
-        image required:</para>
-
-        <programlisting>&gt;qemu-system-x86_64 -enable-kvm -m 8G -cpu host -smp cores=3,sockets=1 \ 
--M q35 -nographic bios /usr/share/qemu/bios.bin \
--boot order=c,menu=on \
--hda 128t.qcow2 \
--device e1000,netdev=net1,mac=52:52:01:02:03:01 \
--netdev tap,id=net1,ifname=tap1,script=no,downscript=no
-
-------------------------------------------------------------------------------
-Booting from Hard Disk...
-.
-
-      * CentOS Linux (3.10.0-514.2.2.el7.x86_64) 7 (Core)
-      CentOS Linux (0-rescue-4e73a369e89e466a888c9c77655a1d65) 7 (Core)
-
-
-      Use the ^ and v keys to change the selection.
-      Press 'e' to edit the selected item, or 'c' for a command prompt.
-------------------------------------------------------------------------------</programlisting>
-
-        <para>Select the first option.</para>
-      </listitem>
-
-      <listitem>
-        <programlisting>|-------------------128T Installer-------------------|
-|                                                    |
-|             Configure Linux Networking             |
-|                                                    |
-|                 Before 128T SetUp?                 |
-|                                                    |
-|                                                    |
-|                  &lt; Yes &gt;  &lt; No &gt;                   |
-|----------------------------------------------------|</programlisting>
-
-        <para>Select NO.</para>
-      </listitem>
-
-      <listitem>
-        <para><programlisting>|----------------------------------------------------|
-|       Please select a role for this node:          |
-|  |----------------------------------------------|  |
-|  |               (*) Router                     |  |
-|  |               ( ) Conductor                  |  |
-|  |----------------------------------------------|  |
-|                                                    |
-|----------------------------------------------------|
-|                  &lt; OK &gt; &lt; Back &gt;                   |
-|----------------------------------------------------|</programlisting>Select
-        Router and OK.</para>
-      </listitem>
-
-      <listitem>
-        <programlisting>|-------------------Conductor Info-------------------|
-|                                                    |
-|  |----------------------------------------------|  |
-|  |1st Conductor Address                         |  |
-|  |Conductor Address                             |  |
-|  |----------------------------------------------|  |
-|                                                    |
-|----------------------------------------------------|
-|       &lt; OK &gt;   &lt; Skip &gt;   &lt; Back &gt;   &lt; Help &gt;      |
-|----------------------------------------------------|</programlisting>
-
-        <para>Select SKIP.</para>
-      </listitem>
-
-      <listitem>
-        <para><programlisting>|----------------------HA Setup----------------------|
-|         What kind of Router node is this?          |
-|  |----------------------------------------------|  |
-|  |(*) Standalone   No HA peer                   |  |
-|  |( ) 1st HA Node  HA peer is not set up        |  |
-|  |( ) 2nd HA Node  HA peer is already set up    |  |
-|  |----------------------------------------------|  |
-|                                                    |
-|                                                    |
-|----------------------------------------------------|
-|               &lt; OK &gt;        &lt; Back &gt;               |
-|----------------------------------------------------|</programlisting>Select
-        Standalone and OK.</para>
-      </listitem>
-
-      <listitem>
-        <programlisting>|---------------------Node Info----------------------|
-|  |----------------------------------------------|  |
-|  |           Node Role      Router              |  |
-|  |           Node Name      128tNode            |  |
-|  |           Router Name    128tRouter          |  |
-|  |----------------------------------------------|  |
-|                                                    |
-|----------------------------------------------------|
-|     &lt; OK &gt;   &lt; Advanced &gt;   &lt; Back &gt;  &lt; Help &gt;     |
-|----------------------------------------------------|</programlisting>
-
-        <para>Enter a name for the router and node, press OK.</para>
-      </listitem>
-
-      <listitem>
-        <programlisting>|-------------------Password Setup-------------------|
-|   Enter the new password for the 128T 'admin'      |
-|   user:                                            |
-|  |----------------------------------------------|  |
-|  |     128Tadmin                                |  |
-|  |----------------------------------------------|  |
-|                                                 |  |
-|----------------------------------------------------|
-|              &lt; OK &gt;      &lt; Back &gt;                  |
-|----------------------------------------------------|</programlisting>
-
-        <para>Enter the password for web access: <literal>128Tadmin</literal>
-        and confirm the password.</para>
-      </listitem>
-
-      <listitem>
-        <programlisting>|--------------------------Anonymous Data Collection--------------------------|
-| The 128T Networking Platform comes packaged with a software process         |
-|("Roadrunner") that is used to proactively monitor the health and liveliness |
-|of the 128T Router and associated components. This watchdog process collects |
-|anonymous information from the router and sends it to 128 Technology for     |
-|storage and analysis. This information helps inform 128 Technology about     |
-|software usage, to aid in the support and improvement of the 128 Technology  |
-|Networking Platform.                                                         |
-|                                                                             |
-|Disabling this feature will prevent the sending of anonymous usage data to   |
-|128 Technology.                                                              |
-|                                                                             |
-|                                                                             |
-|                 &lt; Accept &gt;       &lt; Back &gt;       &lt; Disable &gt;                 |
-|-----------------------------------------------------------------------------|</programlisting>
-
-        <para>Select Accept.</para>
-      </listitem>
-
-      <listitem>
-        <programlisting>|-----128T Statistics Table Creator-----|
-|  Created table for metric 760/827     |
-|  Created table for metric 770/827     |
-|  Created table for metric 780/827     |
-|  Created table for metric 790/827     |
-|  Created table for metric 800/827     |
-|  Created table for metric 810/827     |
-|  Created table for metric 820/827     |
-|  Finished pre-creating stats tables   |
-|  Creating tables for audit events     |
-|  Finished creating audit event tables |
-|  Completed in 27.001386642456055 s    |
-|  Shutting down local Cassandra node   |
-|---------------------------------------|
-|                 &lt; OK &gt;                |
-|---------------------------------------|</programlisting>
-
-        <para>Select OK.</para>
-      </listitem>
-
-      <listitem>
-        <programlisting>|--------128T Installer Status----------|
-|                                       |
-|           Install SUCCESS             |
-|                                       |
-|           Start 128T Router           |
-|           before proceeding to        |
-|           login prompt?               |
-|---------------------------------------|
-|           &lt; Yes &gt;   &lt; No  &gt;           |
-|---------------------------------------|</programlisting>
-
-        <para>Select: Yes</para>
-      </listitem>
-
-      <listitem>
-        <programlisting>localhost login: root
-Password:</programlisting>
-
-        <para>The following user accounts and passwords are created during the
-        ISO installation process:</para>
-
-        <table>
-          <title>Accounts Created</title>
-
-          <tgroup cols="2">
-            <colspec align="left" />
-
-            <thead>
-              <row>
-                <entry align="center">User</entry>
-
-                <entry align="center">Password</entry>
-              </row>
-            </thead>
-
-            <tbody>
-              <row>
-                <entry>root</entry>
-
-                <entry>128tRoutes</entry>
-              </row>
-
-              <row>
-                <entry>t128</entry>
-
-                <entry>128tRoutes</entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-      </listitem>
-
-      <listitem>
-        <para>GUI login via HTTPS is enabled by default on port 443</para>
-
-        <programlisting>[root@localhost ~]# dhclient enp0s2
-[root@localhost ~]# echo "nameserver 8.8.8.8" &gt;&gt;/etc/resolv.conf
-[root@localhost ~]# yum -y install cloud-init
-[root@localhost ~]# reboot</programlisting>
-      </listitem>
-
-      <listitem>
-        <para>Wait to reboot and press CTR+ a+c to enter in qemu
-        monitor.</para>
-
-        <programlisting>(qemu) quit
-&gt; qemu-img info 128t.qcow2
-image: 128t.qcow2
-file format: qcow2
-virtual size: 128G (137438953472 bytes)
-disk size: 5.4G
-cluster_size: 65536
-Format specific information:
-    compat: 1.1
-    lazy refcounts: false
-    refcount bits: 16
-    corrupt: false</programlisting>
-      </listitem>
-
-      <listitem>
-        <para>Compress the generated <filename>128t.qcow2</filename> image to
-        decrease the size of VNF image:</para>
-
-        <programlisting>qemu-img convert -O qcow2 -c 128t.qcow2 centos_128t_compressed.qcow2
-
-&gt; qemu-img info centos_128t_compressed.qcow2
-image: centos_128t_compressed.qcow2
-file format: qcow2
-virtual size: 128G (137438953472 bytes)
-disk size: 1.2G
-cluster_size: 65536
-Format specific information:
-    compat: 1.1
-    lazy refcounts: false
-    refcount bits: 16
-    corrupt: false
-
-centos_128t_compressed.qcow2 - Resulted image can be used in NFV Access.</programlisting>
-      </listitem>
-    </orderedlist></para>
-</appendix>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-cmc-example-usecases/doc/appendix_3.xml b/doc/book-enea-nfv-access-cmc-example-usecases/doc/appendix_3.xml
deleted file mode 100644
index 827e8cd..0000000
--- a/doc/book-enea-nfv-access-cmc-example-usecases/doc/appendix_3.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<appendix id="appendix_three_cmc">
-  <title>How to configure Fortigate VNF (day-0 configuration)</title>
-
-  <para>Please check the README file from Fortigate folder for more
-  details.</para>
-</appendix>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-cmc-example-usecases/doc/appendix_4.xml b/doc/book-enea-nfv-access-cmc-example-usecases/doc/appendix_4.xml
deleted file mode 100644
index 9641f7c..0000000
--- a/doc/book-enea-nfv-access-cmc-example-usecases/doc/appendix_4.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<appendix id="appendix_four_cmc">
-  <title>Running Enea Automation Framework tests</title>
-
-  <para>The most relevant information from the Automation Framework and Test
-  Harness structure:</para>
-
-  <programlisting>|---automation_framework
-|  |---unittestSuite
-|  |  |---128tCleanup.json             - Use case 1 - clean up - test.
-|  |  |---128tDeploy.json              - Use case 1 - test.
-|  |  |---128t_FG_SFCCleanup.json      - Use case 2 - clean up - test.
-|  |  |---128t_FG_SFCDeploy.json       - Use case 2 - test.
-|  |  |---config
-|  |  |  |---cmc  
-            - Folder containing the configuration files used by tests.
-|  |  |---unittestLoader.py
-|  |  |---unittestSuite.py
-|---lab_config
-|  |---me1100-1 
-|  |  |---enp4s0f0_0000_04_00_0.json
-|  |  |---enp4s0f1_0000_04_00_1.json
-|  |  |---ibm_br.json                  - In-band management definition.
-|  |  |---lan_br_enp4s0f1.json         - Lan bridge definition.
-|  |  |---me1100-1.json      
-            - Target definition - make sure to update the "address".
-|  |  |---sfc_br.json                  - Service chain bridge definition.
-|  |  |---vnf_mgmt_br.json             - VNF management bridge definition.
-|---vnf_config
-|  |---128t
-|  |  |---128tInstance.json            - 128T instantiation - used in use case 1.
-|  |  |---128t.json                    - 128T onboarding.
-|  |  |---128tSFCInstance.json         - 128T instantiation - used in use case 2.
-|  |  |---centos_128t_internet_ci.iso  - 128T cloud init (day-0) iso image.
-|  |---fortigate
-|  |  |---fg_basic_fw.conf             - Fortigate day-0 configuration.
-|  |  |---fortigateInstance.json       - Fortigate instantiantion.
-|  |  |---fortigate.json               - Fortigate onboarding.
-|  |  |---fortigateLicense.lic
-             - Fortigate license - replace it with a valid License file.
-|---vnf_image
-|  |---centos_128t_with_ci.qcow2       - 128T qcow2 image.
-|  |---fortios.qcow2                   - Fortigate qcow2 image.</programlisting>
-
-  <para>Make sure to update the relevant configuration file for your setup.
-  The essential files to consider are the target configuration
-  (<filename>me1100-1.json</filename>), the license for the Fortigate VNF, and
-  the 128T cloud-init iso image matching your network.</para>
-
-  <para>To run a test:<programlisting>&gt; cd automation_and_systemtest/automation_framework/unittestSuite
-&gt; python unittestSuite.py -u admin -p admin -H 172.24.3.109 -n me1100-1 -s</programlisting></para>
-</appendix>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-cmc-example-usecases/doc/appendix_5.xml b/doc/book-enea-nfv-access-cmc-example-usecases/doc/appendix_5.xml
deleted file mode 100644
index 7c8c042..0000000
--- a/doc/book-enea-nfv-access-cmc-example-usecases/doc/appendix_5.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<appendix id="appendix_five_cmc">
-  <title>Example Tests Results using the Automation Framework</title>
-
-  <programlisting>Test Host:
-Use Case1 - 128T
-&gt; cd automation_and_systemtest/automation_framework/unittestSuite
-&gt; python unittestSuite.py -u admin -p admin -H 172.24.3.109 -n me1100-1 \
--s 128tDeploy.json -d "128T Deployment"
-
-Running 128T Deployment...
-
-test 001: Add VCPE Agent from me1100-1 device        (__main__.UnittestSuite) ...
-2019-08-13 12:49:58,091 - INFO: Add uCPE device
-2019-08-13 12:49:58,342 - INFO: Done
-ok
-test 002: Wait VCPE Agent device be up (__main__.UnittestSuite) ...
-2019-08-13 12:49:58,358 - INFO: Wait uCPE device
-2019-08-13 12:50:03,470 - INFO: Done
-ok
-test 003: Bind NIC to DPDK for LAN connection (__main__.UnittestSuite) ...
-2019-08-13 12:50:03,486 - INFO: Bind NIC
-2019-08-13 12:50:03,901 - INFO: Done
-ok
-test 004: Creating ibm bridge  (__main__.UnittestSuite) ...
-2019-08-13 12:50:03,920 - INFO: New OVS network bridge
-2019-08-13 12:50:17,465 - INFO: Done
-ok
-test 005: Creating VNF Management bridge  (__main__.UnittestSuite) ...
-2019-08-13 12:50:17,481 - INFO: New OVS network bridge
-2019-08-13 12:50:17,626 - INFO: Done
-ok
-test 006: Creating LAN bridge and attaching enp4s0f1 interface to the bridge \
- (__main__.UnittestSuite) ...
-2019-08-13 12:50:17,643 - INFO: New OVS network bridge
-2019-08-13 12:50:18,313 - INFO: Done
-ok
-test 007: Onboarding 128T VNF (wizard API) (__main__.UnittestSuite) ...
-2019-08-13 12:50:18,332 - INFO: Onboard wizard
-2019-08-13 12:52:52,909 - INFO: Done
-ok
-test 008: Instantiate 128T VNF   (__main__.UnittestSuite) ...
-2019-08-13 12:52:52,924 - INFO: Instantiate VNF
-2019-08-13 12:54:06,219 - INFO: Done
-ok
-
-----------------------------------------------------------------------
-Ran 8 tests in 248.144s
-
-OK
-
-
-Clean-up use-case1
-&gt; python unittestSuite.py -u admin -p admin -H 172.24.3.109 -n me1100-1 \
--s 128tCleanup.json -d "128T Clean-up"
-
-Running 128T Clean-up...
-
-test 001: Destroying 128T VNF     (__main__.UnittestSuite) ...
-2019-08-13 13:03:02,704 - INFO: Destroy VNF
-2019-08-13 13:03:03,619 - INFO: Done
-ok
-test 002: Deleting network bridge LAN  (__main__.UnittestSuite) ...
-2019-08-13 13:03:03,635 - INFO: Delete OVS network bridge
-2019-08-13 13:03:13,857 - INFO: Done
-ok
-test 003: Deleting VNF management bridge  (__main__.UnittestSuite) ...
-2019-08-13 13:03:13,877 - INFO: Delete OVS network bridge
-2019-08-13 13:03:24,027 - INFO: Done
-ok
-test 004: Deleting ibm(In Band Management) bridge  (__main__.UnittestSuite) ...
-2019-08-13 13:03:24,049 - INFO: Delete OVS network bridge
-2019-08-13 13:03:48,815 - INFO: Done
-ok
-test 005: Unbind LAN NIC from DPDK target (__main__.UnittestSuite) ...
-2019-08-13 13:03:48,835 - INFO: Unbind NIC
-2019-08-13 13:03:50,274 - INFO: Done
-ok
-test 006: Offboarding 128t VNF    (__main__.UnittestSuite) ...
-2019-08-13 13:03:50,294 - INFO: Offboard VNF
-2019-08-13 13:03:50,844 - INFO: Done
-ok
-test 007: Remove VCPE Agent me1100-1 device     (__main__.UnittestSuite) ...
-2019-08-13 13:03:50,858 - INFO: Remove uCPE device
-2019-08-13 13:03:50,998 - INFO: Done
-ok
-
-----------------------------------------------------------------------
-Ran 7 tests in 48.308s
-
-OK
-
-
-Use-case2
-&gt; python unittestSuite.py -u admin -p admin -H 172.24.3.109 -n me1100-1 \
--s 128t_FG_SFCDeploy.json -d "128T - Fortigate SFC Deployment"
-Running 128T - Fortigate SFC Deployment...
-
-test 001: Add VCPE Agent from me1100-1 device        (__main__.UnittestSuite) ...
-2019-08-13 13:09:16,146 - INFO: Add uCPE device
-2019-08-13 13:09:16,272 - INFO: Done
-ok
-test 002: Wait VCPE Agent device be up (__main__.UnittestSuite) ...
-2019-08-13 13:09:16,287 - INFO: Wait uCPE device
-2019-08-13 13:09:23,421 - INFO: Done
-ok
-test 003: Bind NIC to DPDK for LAN connection (__main__.UnittestSuite) ...
-2019-08-13 13:09:23,445 - INFO: Bind NIC
-2019-08-13 13:09:24,226 - INFO: Done
-ok
-test 004: Creating ibm bridge  (__main__.UnittestSuite) ...
-2019-08-13 13:09:24,245 - INFO: New OVS network bridge
-2019-08-13 13:09:34,720 - INFO: Done
-ok
-test 005: Creating VNF Management bridge  (__main__.UnittestSuite) ...
-2019-08-13 13:09:34,741 - INFO: New OVS network bridge
-2019-08-13 13:09:34,885 - INFO: Done
-ok
-test 006: Creating LAN bridge and attaching enp4s0f1 interface to the bridge  \
-(__main__.UnittestSuite) ...
-2019-08-13 13:09:34,903 - INFO: New OVS network bridge
-2019-08-13 13:09:35,566 - INFO: Done
-ok
-test 007: Creating SFC(service function chaining) bridge  (__main__.UnittestSuite) ...
-2019-08-13 13:09:35,587 - INFO: New OVS network bridge
-2019-08-13 13:09:35,667 - INFO: Done
-ok
-test 008: Onboarding 128T VNF (wizard API) (__main__.UnittestSuite) ...
-2019-08-13 13:09:35,684 - INFO: Onboard wizard
-2019-08-13 13:12:11,845 - INFO: Done
-ok
-test 009: Onboarding Fortigate VNF (wizard API) (__main__.UnittestSuite) ...
-2019-08-13 13:12:11,861 - INFO: Onboard wizard
-2019-08-13 13:12:16,157 - INFO: Done
-ok
-test 010: Instantiate 128T VNF   (__main__.UnittestSuite) ...
-2019-08-13 13:12:16,175 - INFO: Instantiate VNF
-2019-08-13 13:13:31,681 - INFO: Done
-ok
-test 011: Instantiate Fortigate VNF    (__main__.UnittestSuite) ...
-2019-08-13 13:13:31,738 - INFO: Instantiate VNF
-2019-08-13 13:13:35,985 - INFO: Done
-ok
-
-----------------------------------------------------------------------
-Ran 11 tests in 259.854s
-
-OK
-
-# Access 128T management interface
-https://172.24.12.154:60001
-user: admin
-password: 128Tadmin
-
-# Access Fortigate management interface
-https://172.24.12.154:60002
-user: admin
-password:
-
-
-
-Use case2 clean-up
-&gt; python unittestSuite.py -u admin -p admin -H 172.24.3.109 -n me1100-1 \
--s 128t_FG_SFCCleanup.json -d "128T - Fortigate SFC CleanUp"
-
-Running 128T - Fortigate SFC CleanUp...
-
-test 001: Destroying Fortigate VNF     (__main__.UnittestSuite) ...
-2019-08-13 13:51:30,204 - INFO: Destroy VNF
-2019-08-13 13:51:31,781 - INFO: Done
-ok
-test 002: Destroying 128T VNF     (__main__.UnittestSuite) ...
-2019-08-13 13:51:31,822 - INFO: Destroy VNF
-2019-08-13 13:51:32,729 - INFO: Done
-ok
-test 003: Deleting network bridge SFC  (__main__.UnittestSuite) ...
-2019-08-13 13:51:32,756 - INFO: Delete OVS network bridge
-2019-08-13 13:51:42,863 - INFO: Done
-ok
-test 004: Deleting network bridge LAN  (__main__.UnittestSuite) ...
-2019-08-13 13:51:42,878 - INFO: Delete OVS network bridge
-2019-08-13 13:51:53,087 - INFO: Done
-ok
-test 005: Deleting VNF management bridge  (__main__.UnittestSuite) ...
-2019-08-13 13:51:53,103 - INFO: Delete OVS network bridge
-2019-08-13 13:52:03,251 - INFO: Done
-ok
-test 006: Deleting ibm(In Band Management) bridge  (__main__.UnittestSuite) ...
-2019-08-13 13:52:03,269 - INFO: Delete OVS network bridge
-2019-08-13 13:52:29,868 - INFO: Done
-ok
-test 007: Unbind LAN NIC from DPDK target (__main__.UnittestSuite) ...
-2019-08-13 13:52:29,885 - INFO: Unbind NIC
-2019-08-13 13:52:31,415 - INFO: Done
-ok
-test 008: Offboarding 128t VNF    (__main__.UnittestSuite) ...
-2019-08-13 13:52:31,435 - INFO: Offboard VNF
-2019-08-13 13:52:32,009 - INFO: Done
-ok
-test 009: Offboarding Fortigate VNF    (__main__.UnittestSuite) ...
-2019-08-13 13:52:32,023 - INFO: Offboard VNF
-2019-08-13 13:52:32,157 - INFO: Done
-ok
-test 010: Remove VCPE Agent me1100-1 device     (__main__.UnittestSuite) ...
-2019-08-13 13:52:32,170 - INFO: Remove uCPE device
-2019-08-13 13:52:32,294 - INFO: Done
-ok
-
-----------------------------------------------------------------------
-Ran 10 tests in 62.104s
-
-OK</programlisting>
-</appendix>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-cmc-example-usecases/doc/book.xml b/doc/book-enea-nfv-access-cmc-example-usecases/doc/book.xml
deleted file mode 100644
index 459aec8..0000000
--- a/doc/book-enea-nfv-access-cmc-example-usecases/doc/book.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED">
-]>
-<book id="book_enea_nfv_access_cmc_example_usecases">
-  <title><trademark class="registered">Enea</trademark> NFV Access CMC Networks Example Use-cases</title>
-
-  <subtitle>Release Version
-         <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
-         xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
-
-  <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
-
-  <xi:include href="../../s_docbuild/template/docsrc_common/bookinfo_userdoc.xml"
-              xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-  <xi:include href="introduction.xml"
-              xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-  <xi:include href="general_env_prerequisites.xml"
-              xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-  <xi:include href="128t_vnf_router.xml"
-              xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-  <xi:include href="service_chaining_128t_fortigate.xml"
-              xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-  <xi:include href="usecases_autoframe.xml"
-              xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-  <xi:include href="appendix_1.xml"
-              xmlns:xi="http://www.w3.org/2001/XInclude" />
-                          
-  <xi:include href="appendix_2.xml"
-              xmlns:xi="http://www.w3.org/2001/XInclude" />
-                          
-  <xi:include href="appendix_3.xml"
-              xmlns:xi="http://www.w3.org/2001/XInclude" />
-                          
-  <xi:include href="appendix_4.xml"
-              xmlns:xi="http://www.w3.org/2001/XInclude" />
-                          
-  <xi:include href="appendix_5.xml"
-              xmlns:xi="http://www.w3.org/2001/XInclude" />
-</book>
diff --git a/doc/book-enea-nfv-access-cmc-example-usecases/doc/enea_vnf_examples.xml b/doc/book-enea-nfv-access-cmc-example-usecases/doc/enea_vnf_examples.xml
deleted file mode 100644
index 8f11107..0000000
--- a/doc/book-enea-nfv-access-cmc-example-usecases/doc/enea_vnf_examples.xml
+++ /dev/null
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<chapter id="enea_vnf_examples">
-  <title>Enea VNF Example Use-cases</title>
-
-  <para>Enea NFV Access is a complete NFV Infrastructure (NFVI) platform
-  designed for deployment on white box uCPEs at the customer premise, and
-  optimized for common Virtual Customer Premises Equipment (vCPE) and SD-WAN
-  use cases.</para>
-
-  <section id="prere_enea_vnf">
-    <title>Prerequisites</title>
-
-    <para>The following file(s) are needed for this example use-case:
-    <literal>enea-nfv-access-vnf-qemux86-64.qcow2</literal>. This image is
-    provided with your release.</para>
-  </section>
-
-  <section id="enea_vnf">
-    <title>TestPMD VNF</title>
-
-    <para>In this use-case, <literal>uCPE device 1</literal> will run pktgen
-    (the DPDK application) and <literal>uCPE device 2</literal> will onboard
-    and instantiate two VNFs. One VNF will run <literal>testpmd_fwd</literal>,
-    forwarding traffic, and the other will run <literal>testpmd_term</literal>
-    which will terminate traffic.</para>
-
-    <figure>
-      <title>Enea TestPMD VNF Overview</title>
-
-      <mediaobject>
-        <imageobject>
-          <imagedata align="center"
-                     fileref="images/enea_vnf_demo_overview.png" scale="80" />
-        </imageobject>
-      </mediaobject>
-    </figure>
-
-    <section id="enea_vnf_setup">
-      <title>Use-case Setup</title>
-
-      <para><emphasis role="bold">Configuring Network Interfaces on uCPE
-      devices:</emphasis></para>
-
-      <orderedlist>
-        <listitem>
-          <para>Bind the host interfaces to the DPDK by selecting
-          <literal>uCPE device 1</literal> first, then accessing
-          <literal>Configuration</literal> -&gt;
-          <literal>OpenVSwitch</literal> -&gt; <literal>Host
-          Interfaces</literal> -&gt; <literal>Add</literal>.</para>
-        </listitem>
-
-        <listitem>
-          <para>Select the network interface that will be used to connect to
-          the second uCPE device and configure it for the DPDK.</para>
-        </listitem>
-
-        <listitem>
-          <para>Select the <literal>Create</literal> button to send the
-          configuration to <literal>uCPE device 1</literal>.</para>
-        </listitem>
-
-        <listitem>
-          <para>Repeat these same steps on <literal>uCPE device
-          2</literal>.</para>
-        </listitem>
-
-        <listitem>
-          <para>Click the <literal>Add</literal> button from the Bridges
-          tab.</para>
-        </listitem>
-
-        <listitem>
-          <para>Create an Open vSwitch bridge (<literal>ovsbr0</literal>) on
-          <literal>uCPE device 1</literal> that uses one DPDK interface, by
-          selecting <literal>uCPE device 1</literal>, then:
-          <literal>Configuration</literal> -&gt;<literal>OpenVSwitch</literal>
-          -&gt;<literal>Bridges</literal>.</para>
-        </listitem>
-      </orderedlist>
-
-      <para><emphasis role="bold">Onboarding the VNF:</emphasis></para>
-
-      <orderedlist>
-        <listitem>
-          <para>Select <literal>VNF</literal>
-          -&gt;<literal>Descriptor</literal> -&gt;
-          <literal>On-board</literal>.</para>
-        </listitem>
-
-        <listitem>
-          <para>Select the <literal>VM Image</literal> radio button.</para>
-        </listitem>
-
-        <listitem>
-          <para>Provide the path to the qcow image by selecting
-          <literal>Browse </literal> from the <literal>VM image file</literal>
-          option.</para>
-        </listitem>
-
-        <listitem>
-          <para>Fill the required fields below and press
-          <literal>Onboard</literal>:</para>
-
-          <itemizedlist spacing="compact">
-            <listitem>
-              <para><emphasis role="bold">Memory in MB</emphasis>: 1024</para>
-            </listitem>
-
-            <listitem>
-              <para><emphasis role="bold">Nr. of CPUs</emphasis>: 1</para>
-            </listitem>
-
-            <listitem>
-              <para><emphasis role="bold">Storage in GB</emphasis>: 10</para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
-      </orderedlist>
-
-      <para><emphasis role="bold">Instantiating two VNFs on uCPE device
-      2:</emphasis></para>
-
-      <orderedlist>
-        <listitem>
-          <para>Select uCPE device 2, then access <literal>VNF</literal> -&gt;
-          <literal>Instances</literal> -&gt; <literal>Add</literal>.</para>
-        </listitem>
-
-        <listitem>
-          <para>Fill-in the required fields and click
-          <literal>Create</literal>.</para>
-        </listitem>
-
-        <listitem>
-          <para>Configure VNF 1 to forward traffic.</para>
-        </listitem>
-
-        <listitem>
-          <para>Configure VNF 2 to terminate traffic.</para>
-        </listitem>
-
-        <listitem>
-          <para>Add Open vSwitch flows to control this traffic:</para>
-
-          <figure>
-            <title>Configuring the FWD flow</title>
-
-            <mediaobject>
-              <imageobject>
-                <imagedata align="center" fileref="images/flow_fwd.png"
-                           scale="90" />
-              </imageobject>
-            </mediaobject>
-          </figure>
-
-          <figure>
-            <title>Configuring the TERM flow</title>
-
-            <mediaobject>
-              <imageobject>
-                <imagedata align="center" fileref="images/flow_term.png"
-                           scale="90" />
-              </imageobject>
-            </mediaobject>
-          </figure>
-        </listitem>
-
-        <listitem>
-          <para>Start pktgen on uCPE device 1. Connect to the device by
-          selecting it first, then access <literal>SSH</literal> -&gt;
-          <literal>user</literal> (root) and perform the following:</para>
-
-          <programlisting>cd /usr/share/apps/pktgen/
-./pktgen -c 0x7 -n 4 --proc-type auto --socket-mem 256 -w 0000:05:00.3 -- \
--P -m "[1:2].0"
-Pktgen:/&gt; start 0</programlisting>
-
-          <note>
-            <para>The PCI address &lt;0000:05:00.3&gt; used in this example
-            varies depending on the uCPE device. To determine the exact PCI
-            address used, look in the uCPE device specific Network
-            configuration.</para>
-          </note>
-        </listitem>
-      </orderedlist>
-    </section>
-
-    <section id="test_ena_vnf">
-      <title>Testing the Use-case</title>
-
-      <para>Connect to the forwarder VNF in order to check the traffic
-      statistics, by selecting the uCPE device first, then accessing
-      <literal>SSH</literal> -&gt; <literal>user</literal> (root):</para>
-
-      <programlisting>Virsh list
-Virsh console 1
-# Qemux86-64 login: root
-tail -f /var/log/testpmd-out</programlisting>
-
-      <figure>
-        <title>Traffic Statistics</title>
-
-        <mediaobject>
-          <imageobject>
-            <imagedata align="center"
-                       fileref="images/connection_information.png" scale="70" />
-          </imageobject>
-        </mediaobject>
-      </figure>
-    </section>
-
-    <section condition="hidden" id="vnf_pci">
-      <title>TestPMD VNF using PCI passthrough</title>
-
-      <para>In this use case, uCPE device 1 will run the Pktgen and uCPE
-      device 2 will run the TestPMD VNF. Both will be using PCI
-      passthrough:</para>
-
-      <figure>
-        <title>TestPMD VNF using PCI passthrough Overview</title>
-
-        <mediaobject>
-          <imageobject>
-            <imagedata align="center" fileref="images/testPMD_VNF_PCI.png"
-                       scale="65" />
-          </imageobject>
-        </mediaobject>
-      </figure>
-
-      <orderedlist>
-        <listitem>
-          <para>Make sure that neither uCPE device 1 nor uCPE device 2 have
-          any configured host interfaces by selcting uCPE device :
-          <literal>Configuration</literal> -&gt;
-          <literal>OpenVSwitch</literal> -&gt; <literal>Host
-          Interfaces</literal>.</para>
-        </listitem>
-
-        <listitem>
-          <para>On uCPE device 1 start the Pktgen VNF. Select
-          <literal>PciPassthrough</literal> as the Interface type.</para>
-
-          <para>From the drop-down list, select the PCI interface
-          corresponding to the NIC which is connected to uCPE device 2:</para>
-
-          <figure>
-            <title>Selecting the Pktgen VNF Interface</title>
-
-            <mediaobject>
-              <imageobject>
-                <imagedata align="center"
-                           fileref="images/pciPass_interface.png" scale="70" />
-              </imageobject>
-            </mediaobject>
-          </figure>
-        </listitem>
-
-        <listitem>
-          <para>On uCPE device 2, start the TestPmdForwarder VNF. Select
-          "PciPassthrough" as the Interface type. From the drop-down list,
-          select the PCI interface corresponding to the NIC which is connected
-          to uCPE device 1:</para>
-
-          <figure>
-            <title>Selecting the TestPmdForwarder VNF Interface</title>
-
-            <mediaobject>
-              <imageobject>
-                <imagedata align="center"
-                           fileref="images/testpmd_fwdvnf_int.png" scale="70" />
-              </imageobject>
-            </mediaobject>
-          </figure>
-        </listitem>
-
-        <listitem>
-          <para>To check that traffic is being forwarded from uCPE device 2,
-          SSH to the uCPE device and connect to the VNFs console:</para>
-
-          <programlisting>Right click on uCPE device  2 and select SSH.
-Run: virsh list
-Run: virsh console [VM NAME]
-Run: tail -f /opt/testpmd-out</programlisting>
-        </listitem>
-      </orderedlist>
-    </section>
-  </section>
-</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-cmc-example-usecases/doc/general_env_prerequisites.xml b/doc/book-enea-nfv-access-cmc-example-usecases/doc/general_env_prerequisites.xml
deleted file mode 100644
index c0df438..0000000
--- a/doc/book-enea-nfv-access-cmc-example-usecases/doc/general_env_prerequisites.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<chapter id="general_env_setup">
-  <title>General Environment Setup</title>
-
-  <section id="gen_prereq">
-    <title>Prerequisites</title>
-
-    <table>
-      <title>General Prerequisites</title>
-
-      <tgroup cols="2">
-        <colspec align="center" />
-
-        <colspec colwidth="2*" />
-
-        <colspec colwidth="5*" />
-
-        <thead>
-          <row>
-            <entry align="center">Prerequisites</entry>
-
-            <entry align="center">Observations</entry>
-          </row>
-        </thead>
-
-        <tbody>
-          <row>
-            <entry align="left">Kontron me1100 target<itemizedlist>
-                <listitem>
-                  <para>Processor Xeon-D</para>
-                </listitem>
-
-                <listitem>
-                  <para>2 x 10G SFP/SFP+</para>
-                </listitem>
-
-                <listitem>
-                  <para>SSD storage</para>
-                </listitem>
-
-                <listitem>
-                  <para>32 GB RAM</para>
-                </listitem>
-              </itemizedlist></entry>
-
-            <entry align="left"><itemizedlist>
-                <listitem>
-                  <para>This is an example hardware configuration available in
-                  the Enea internal lab.</para>
-                </listitem>
-
-                <listitem>
-                  <para>One of the SFP ports is connected to a network with
-                  DHCP server access (receiving a dynamic IP based on
-                  MAC).</para>
-                </listitem>
-
-                <listitem>
-                  <para>The target has network access to the uCPE
-                  Manager.</para>
-                </listitem>
-
-                <listitem>
-                  <para>Enea NFV Access must be installed on the target. For
-                  details on how to install Enea NFV Access, please see <olink
-                  targetdoc="book_enea_nfv_access_getting_started"
-                  targetptr="access_installer">How to install Enea NFV Access
-                  in <xi:include
-                  href="../../s_docbuild/olinkdb/pardoc-names.xml"
-                  xmlns:xi="http://www.w3.org/2001/XInclude"
-                  xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>.</para>
-                </listitem>
-              </itemizedlist></entry>
-          </row>
-
-          <row>
-            <entry align="left">Management machine - Linux based
-            (CentOS)</entry>
-
-            <entry align="left"><itemizedlist>
-                <listitem>
-                  <para>The uCPE Manager must be installed on this host or
-                  virtual machine. For installation details see, <olink
-                  targetdoc="book_enea_nfv_access_getting_started"
-                  targetptr="install_ucpe_manager">How to Install the uCPE
-                  Manager in <xi:include
-                  href="../../s_docbuild/olinkdb/pardoc-names.xml"
-                  xmlns:xi="http://www.w3.org/2001/XInclude"
-                  xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>.</para>
-                </listitem>
-
-                <listitem>
-                  <para>The uCPE Manager must have access to the me1100
-                  target.</para>
-                </listitem>
-
-                <listitem>
-                  <para>A web browser must be installed to access the
-                  management interface of the VNFs. The management interface
-                  of any VNF can be accessed from any machine connected on the
-                  same network with the me1100 target.</para>
-                </listitem>
-              </itemizedlist></entry>
-          </row>
-
-          <row>
-            <entry align="left">Development machine - Linux based</entry>
-
-            <entry align="left"><itemizedlist>
-                <listitem>
-                  <para>The Automation Framework and Test Harness must be
-                  installed. Please see the Enea NFV Access Automation
-                  Framework and Test Harness User Guide for more info.</para>
-                </listitem>
-
-                <listitem>
-                  <para>This is a host or virtual machine with network access
-                  to the uCPE Manager and the me1100 target.</para>
-                </listitem>
-
-                <listitem>
-                  <para>It can be used for the 128T VNF installation. Please
-                  see Appendix B for more details.</para>
-                </listitem>
-              </itemizedlist></entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-  </section>
-
-  <section id="rel_structure_cmc">
-    <title>Release structure</title>
-
-    <programlisting>|---ENEA_NFV_Access
-|  |---doc
-|  |  |---book-enea-nfv-access-auto-fw-th-user-guide.pdf
-|  |  |---book-enea-nfv-access-cmc-example-usecases
-|  |  |---book-enea-nfv-access-example-usecases.pdf
-|  |  |---book-enea-nfv-access-getting-started.pdf
-|  |  |---book-enea-nfv-access-open-source.pdf
-|  |  |---book-enea-nfv-access-release-info.pdf
-|  |  |---book-enea-nfv-access-vnf-onboarding-guide.pdf
-|  |  |---book-enea-ucpe-manager-open-source.pdf
-|  |  |---book-enea-nfv-access-auto-fw-th-user-guide.pdf
-|  |  |---book-enea-nfv-access-system-test-specification.pdf
-|  |---enea-nfv-access-edgelink-netconf-xeon-d-20190812201510.hddimg \
-          - NFV Access USB installer image
-|---automation_and_systemtest.tar.gz  - Automation framework and tests                                                        
-|---book-enea-nfv-access-cmc-example-usecases.pdf
-|---128T
-|  |---128t-cloud-init-example.tar.gz
-|  |---centos_128t_internet_ci.iso
-|  |---centos_128t_with_ci.qcow2
-|---Fortigate
-|  |---fg_basic_fw_example.conf
-|  |---README
-|---uCPE_Manager
-|  |---ucpeManager_1.0_b10-CentOS.tar.gz
-|  |---ucpeManager_1.0_b10-CentOS-VM.ova
-|  |---ucpeManager_1.0_b10-Windows.zip</programlisting>
-  </section>
-</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-cmc-example-usecases/doc/images/kontron_me1100.png b/doc/book-enea-nfv-access-cmc-example-usecases/doc/images/kontron_me1100.png
deleted file mode 100755
index 9ed0203..0000000
--- a/doc/book-enea-nfv-access-cmc-example-usecases/doc/images/kontron_me1100.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-cmc-example-usecases/doc/images/kontron_me1100_servicechain.png b/doc/book-enea-nfv-access-cmc-example-usecases/doc/images/kontron_me1100_servicechain.png
deleted file mode 100755
index e568824..0000000
--- a/doc/book-enea-nfv-access-cmc-example-usecases/doc/images/kontron_me1100_servicechain.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-cmc-example-usecases/doc/introduction.xml b/doc/book-enea-nfv-access-cmc-example-usecases/doc/introduction.xml
deleted file mode 100644
index 5365b16..0000000
--- a/doc/book-enea-nfv-access-cmc-example-usecases/doc/introduction.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<chapter id="intro_cmc">
-  <title>Introduction</title>
-
-  <para>Enea NFV Access for universal Customer Premise Equipment (uCPE) is a
-  virtualization and management platform, which allows end-users to introduce,
-  instantiate, and run third-party VNFs onto their operating systems. The
-  solution is comprised of two major components working in close
-  cooperation:</para>
-
-  <itemizedlist>
-    <listitem>
-      <para>The Enea NFV Access Runtime Platform, which acts as the host for
-      Virtualized Network Functions (VNFs) and provides management over
-      NETCONF.</para>
-    </listitem>
-
-    <listitem>
-      <para>The Enea uCPE Manager, a solution that runs on an external server,
-      providing VNF Management functionality and managing large numbers of
-      uCPEs.</para>
-    </listitem>
-  </itemizedlist>
-
-  <para>Enea NFV Access for CMC Networks is tailored around the two use cases
-  agreed upon during initial discussions. The current version of Enea NFV
-  Access provides a working and deployable configuration example for the 128T
-  router and the Fortinet Firewall service chained together on a Kontron
-  ME-1100 Xeon-D based platform.</para>
-
-  <para>This document describes all steps required to replicate the use cases
-  in the customer environment. The information provided will guide the user in
-  reproducing the setup using either the uCPE Manager GUI or the Automation
-  Framework and Test Harness.</para>
-
-  <note>
-    <itemizedlist>
-      <listitem>
-        <para>All VNF configurations should be seen as example configurations
-        made while working in the Enea internal lab. The customer will update
-        these configurations according to his local network setup.
-        Particularities are described in the Appendix chapters.</para>
-      </listitem>
-
-      <listitem>
-        <para>It is assumed that the user is familiar with Enea NFV Access and
-        has studied the official documentation, namely the "Enea NFV Access
-        Getting Started" manual before proceeding with this document.</para>
-      </listitem>
-    </itemizedlist>
-  </note>
-
-  <section condition="hidden" id="rev_hist">
-    <title>Revision History</title>
-
-    <table>
-      <title>Revisions</title>
-
-      <tgroup cols="4">
-        <colspec align="center" />
-
-        <thead>
-          <row>
-            <entry align="center">Revision</entry>
-
-            <entry align="center">Author</entry>
-
-            <entry align="center">Date</entry>
-
-            <entry align="center">Purpose of Revision</entry>
-          </row>
-        </thead>
-
-        <tbody>
-          <row>
-            <entry></entry>
-
-            <entry></entry>
-
-            <entry></entry>
-
-            <entry></entry>
-          </row>
-
-          <row>
-            <entry></entry>
-
-            <entry></entry>
-
-            <entry></entry>
-
-            <entry></entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-  </section>
-
-  <section condition="hidden" id="ref_cmc">
-    <title>References</title>
-
-    <remark>[1]What does this refer to and what should be listed
-    here.</remark>
-  </section>
-
-  <section id="def_acro_cmc">
-    <title>Definitions and Acronyms</title>
-
-    <table>
-      <title>Definitions and Acronyms</title>
-
-      <tgroup cols="2">
-        <colspec align="left" />
-
-        <colspec colwidth="2*" />
-
-        <colspec colwidth="5*" />
-
-        <thead>
-          <row>
-            <entry align="center">Component</entry>
-
-            <entry align="center">Definition</entry>
-          </row>
-        </thead>
-
-        <tbody>
-          <row>
-            <entry>uCPE Manager</entry>
-
-            <entry>The Enea uCPE Manager is an EMS/NMS platform that provides
-            the VNF Management capabilities for NFV Access devices. The uCPE
-            Manager can be deployed on a Linux (CentOS) based physical or
-            virtual server. Coresident with the uCPE Manager is additional
-            functionality, which includes the Automation Framework.</entry>
-          </row>
-
-          <row>
-            <entry>Automation Framework</entry>
-
-            <entry>The Automation Framework consists of a set of tools and a
-            collection of Python based scripts that can be used to automate
-            the process of onboarding a VNF with all of the required
-            configuration for day zero deployment at scale. This tooling calls
-            the auto-generated REST API that is exposed on the uCPE Manager as
-            a north bound interface.</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-  </section>
-</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-cmc-example-usecases/doc/service_chaining_128t_fortigate.xml b/doc/book-enea-nfv-access-cmc-example-usecases/doc/service_chaining_128t_fortigate.xml
deleted file mode 100644
index 458da7f..0000000
--- a/doc/book-enea-nfv-access-cmc-example-usecases/doc/service_chaining_128t_fortigate.xml
+++ /dev/null
@@ -1,1087 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<chapter id="service_chaining_128t_fortigate">
-  <title>Service Chaining 128T - Fortigate Example Use-case</title>
-
-  <para>The term service chaining or service function chaining (SFC) is used
-  to describe the definition and instantiation of an ordered list of instances
-  of such service functions and the subsequent "steering" of traffic flows
-  through those service functions. The set of enabled service function chains
-  reflects operator service offerings and is designed in conjunction with
-  application delivery and service and network policy.</para>
-
-  <para>The Network Service Header (NSH - RFC 8300) is a service-chaining
-  protocol that is added to network traffic, in the packet header, to describe
-  a sequence of service nodes (PNFs or VNFs) that the packet must be routed to
-  prior to reaching its destination address, thus creating a service
-  chain.</para>
-
-  <section id="prereq_serv_chain_cmc">
-    <title>Prerequisites</title>
-
-    <para>The 128T router and the Fortinet firewall in a service chain require
-    the following prequisites for this example use case:</para>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>1 in band management port for device management.</para>
-      </listitem>
-
-      <listitem>
-        <para>1 in band management port for the 128T router.</para>
-      </listitem>
-
-      <listitem>
-        <para>1 in band management port for Fortinet.</para>
-      </listitem>
-
-      <listitem>
-        <para>1 WAN interface for Fortinet.</para>
-      </listitem>
-
-      <listitem>
-        <para>1 LAN facing interface for Fortinet.</para>
-      </listitem>
-
-      <listitem>
-        <para>1 WAN facing interface for the 128T router.</para>
-      </listitem>
-
-      <listitem>
-        <para>1 service chain (SFC Bridged interface) to sit between the
-        Firewall and vRouter.</para>
-      </listitem>
-    </itemizedlist>
-  </section>
-
-  <section id="ser_chain_uc">
-    <title>Service Chaining 128T - Fortigate</title>
-
-    <figure>
-      <title>Service Chaining 128T - Fortigate Setup Overview</title>
-
-      <mediaobject>
-        <imageobject>
-          <imagedata contentwidth="600"
-                     fileref="images/kontron_me1100_servicechain.png" />
-        </imageobject>
-      </mediaobject>
-    </figure>
-
-    <section>
-      <title>Use-case Setup</title>
-
-      <para><emphasis role="bold">Configuring Network Interfaces on uCPE
-      devices:</emphasis><orderedlist>
-          <listitem>
-            <para>Log into the uCPE Manager with both username and password
-            values: <literal>admin</literal>.</para>
-          </listitem>
-
-          <listitem>
-            <para>Add the Kontron me1100 uCPE device into the uCPE Manager:
-            <literal>Devices -&gt; Manage -&gt; Add</literal>.</para>
-
-            <para>Fill in the required fields with the following data:</para>
-
-            <table>
-              <title>Device Details</title>
-
-              <tgroup cols="2">
-                <colspec align="left" />
-
-                <colspec colwidth="2*" />
-
-                <colspec colwidth="5*" />
-
-                <thead>
-                  <row>
-                    <entry align="center">Field</entry>
-
-                    <entry align="center">Value</entry>
-                  </row>
-                </thead>
-
-                <tbody>
-                  <row>
-                    <entry>Type</entry>
-
-                    <entry>Enea universal CPE</entry>
-                  </row>
-
-                  <row>
-                    <entry>Release</entry>
-
-                    <entry>1.0</entry>
-                  </row>
-
-                  <row>
-                    <entry>Name</entry>
-
-                    <entry>me1100</entry>
-                  </row>
-
-                  <row>
-                    <entry>IP/DNS Address</entry>
-
-                    <entry>&lt;unspecified&gt;<note>
-                        <para>Please do not provide an IP address.</para>
-                      </note></entry>
-                  </row>
-
-                  <row>
-                    <entry>Description</entry>
-
-                    <entry>Kontron Target 1</entry>
-                  </row>
-
-                  <row>
-                    <entry>Device ID</entry>
-
-                    <entry>The value of the Device ID must be the same as the
-                    one used during the NFV Access installation.</entry>
-                  </row>
-
-                  <row>
-                    <entry>SSH Port</entry>
-
-                    <entry>830</entry>
-                  </row>
-
-                  <row>
-                    <entry>SSH User Name</entry>
-
-                    <entry>root</entry>
-                  </row>
-
-                  <row>
-                    <entry>Password</entry>
-
-                    <entry>null</entry>
-                  </row>
-
-                  <row>
-                    <entry>OK</entry>
-
-                    <entry>Green status indicates connection with uCPE device
-                    was established.</entry>
-                  </row>
-                </tbody>
-              </tgroup>
-            </table>
-          </listitem>
-
-          <listitem>
-            <para>In order to add the device on the map: Right-Click on
-            <literal>Map -&gt; Place Device -&gt; me1100</literal>.</para>
-
-            <note>
-              <para>In order for the device to connect to the uCPE Manager, 
-                it must be added to the uCPE Manager and be powered on, 
-                having the NFV Access platform started, otherwise it must 
-                be rebooted.</para>
-            </note>
-          </listitem>
-
-          <listitem>
-            <para>Configure the infrastructure for the 128T and Fortigate VNFs
-            in the service chain by creating four OVS bridges and a host
-            interface.</para>
-
-            <para>Add the Host Interface by selecting the
-            <literal>me1100</literal> device, then <literal>Configuration
-            -&gt; External Interfaces -&gt; Configuration -&gt; Add</literal>.
-            Fill in the required fields with the following data:</para>
-
-            <table>
-              <title>Host Interface Details</title>
-
-              <tgroup cols="2">
-                <colspec align="left" />
-
-                <colspec colwidth="2*" />
-
-                <colspec colwidth="5*" />
-
-                <thead>
-                  <row>
-                    <entry align="center">Field</entry>
-
-                    <entry align="center">Value</entry>
-                  </row>
-                </thead>
-
-                <tbody>
-                  <row>
-                    <entry>Source</entry>
-
-                    <entry><literal>enp4s0f1</literal>. The only interface
-                    available for LAN connection.</entry>
-                  </row>
-
-                  <row>
-                    <entry>type</entry>
-
-                    <entry>dpdk</entry>
-                  </row>
-
-                  <row>
-                    <entry>networking-type</entry>
-
-                    <entry>dpdk</entry>
-                  </row>
-
-                  <row>
-                    <entry>dpdk-type</entry>
-
-                    <entry>vfio-pci</entry>
-                  </row>
-
-                  <row>
-                    <entry>Create</entry>
-
-                    <entry>&lt;interface enp4s0f1 ready to be used in a LAN
-                    bridge.&gt;</entry>
-                  </row>
-                </tbody>
-              </tgroup>
-            </table>
-
-            <para>Add the OVS bridges by selecting the me1100 device then:
-            <literal>Configuration -&gt; OpenVSwitch -&gt; Bridges -&gt;
-            Add</literal>.</para>
-
-            <para>Fill in the required fields for each bridge with the
-            following data from each table:</para>
-
-            <table>
-              <title>ibm_br Bridge Details</title>
-
-              <tgroup cols="2">
-                <colspec align="left" />
-
-                <colspec colwidth="2*" />
-
-                <colspec colwidth="5*" />
-
-                <thead>
-                  <row>
-                    <entry align="center">Field</entry>
-
-                    <entry align="center">Value</entry>
-                  </row>
-                </thead>
-
-                <tbody>
-                  <row condition="hidden">
-                    <entry>id</entry>
-
-                    <entry>&lt;autogenerated - do not change&gt;</entry>
-                  </row>
-
-                  <row>
-                    <entry>Name</entry>
-
-                    <entry><literal>ibm_br</literal></entry>
-                  </row>
-
-                  <row>
-                    <entry>ovs-bridge-type</entry>
-
-                    <entry>InbandMgmt</entry>
-                  </row>
-
-                  <row condition="hidden">
-                    <entry>mgmt-address</entry>
-
-                    <entry>Provide the IP address of the uCPE Manager machine
-                    (E.g. 172.24.3.109).</entry>
-                  </row>
-
-                  <row condition="hidden">
-                    <entry>mgmt-port</entry>
-
-                    <entry>830</entry>
-                  </row>
-
-                  <row>
-                    <entry>Create</entry>
-
-                    <entry></entry>
-                  </row>
-                </tbody>
-              </tgroup>
-            </table>
-
-            <table>
-              <title>vnf_mgmt_br Bridge Details</title>
-
-              <tgroup cols="2">
-                <colspec align="left" />
-
-                <colspec colwidth="2*" />
-
-                <colspec colwidth="5*" />
-
-                <thead>
-                  <row>
-                    <entry align="center">Field</entry>
-
-                    <entry align="center">Value</entry>
-                  </row>
-                </thead>
-
-                <tbody>
-                  <row condition="hidden">
-                    <entry>id</entry>
-
-                    <entry>&lt;autogenerated - do not change&gt;</entry>
-                  </row>
-
-                  <row>
-                    <entry>Name</entry>
-
-                    <entry><literal>vnf_mgmt_br</literal></entry>
-                  </row>
-
-                  <row>
-                    <entry>ovs-bridge-type</entry>
-
-                    <entry>vnfMgmt</entry>
-                  </row>
-
-                  <row>
-                    <entry>vnf-mgmt-address</entry>
-
-                    <entry>10.0.0.1</entry>
-                  </row>
-
-                  <row>
-                    <entry>Create</entry>
-
-                    <entry></entry>
-                  </row>
-                </tbody>
-              </tgroup>
-            </table>
-
-            <table>
-              <title>lan_br Bridge Details</title>
-
-              <tgroup cols="2">
-                <colspec align="left" />
-
-                <colspec colwidth="2*" />
-
-                <colspec colwidth="5*" />
-
-                <thead>
-                  <row>
-                    <entry align="center">Field</entry>
-
-                    <entry align="center">Value</entry>
-                  </row>
-                </thead>
-
-                <tbody>
-                  <row condition="hidden">
-                    <entry>id</entry>
-
-                    <entry>&lt;autogenerated - do not change&gt;</entry>
-                  </row>
-
-                  <row>
-                    <entry>Name</entry>
-
-                    <entry><literal>lan_br</literal></entry>
-                  </row>
-
-                  <row>
-                    <entry>ovs-bridge-type</entry>
-
-                    <entry>dataPlane</entry>
-                  </row>
-
-                  <row>
-                    <entry>sub-type</entry>
-
-                    <entry>communication</entry>
-                  </row>
-
-                  <row>
-                    <entry>+</entry>
-
-                    <entry>Name: enp4s0f1 OK</entry>
-                  </row>
-
-                  <row>
-                    <entry>Create</entry>
-
-                    <entry></entry>
-                  </row>
-                </tbody>
-              </tgroup>
-            </table>
-
-            <table>
-              <title>sfc_br Bridge Details</title>
-
-              <tgroup cols="2">
-                <colspec align="left" />
-
-                <colspec colwidth="2*" />
-
-                <colspec colwidth="5*" />
-
-                <thead>
-                  <row>
-                    <entry align="center">Field</entry>
-
-                    <entry align="center">Value</entry>
-                  </row>
-                </thead>
-
-                <tbody>
-                  <row condition="hidden">
-                    <entry>id</entry>
-
-                    <entry>&lt;autogenerated - do not change&gt;</entry>
-                  </row>
-
-                  <row>
-                    <entry>Name</entry>
-
-                    <entry><literal>sfc_br</literal></entry>
-                  </row>
-
-                  <row>
-                    <entry>ovs-bridge-type</entry>
-
-                    <entry>dataPlane</entry>
-                  </row>
-
-                  <row>
-                    <entry>sub-type</entry>
-
-                    <entry>integration</entry>
-                  </row>
-
-                  <row>
-                    <entry>Create</entry>
-
-                    <entry></entry>
-                  </row>
-                </tbody>
-              </tgroup>
-            </table>
-          </listitem>
-        </orderedlist></para>
-
-      <para><emphasis role="bold">Onboarding the VNFs:</emphasis></para>
-
-      <para>Onboard the 128T VNF VM Image through <literal>VNF -&gt;
-      Descriptors -&gt; On-board -&gt; VM Image</literal>, and fill in the
-      required fields with the following values:</para>
-
-      <table>
-        <title>128T VM Image Details</title>
-
-        <tgroup cols="2">
-          <colspec align="left" />
-
-          <colspec colwidth="2*" />
-
-          <colspec colwidth="5*" />
-
-          <thead>
-            <row>
-              <entry align="center">Field</entry>
-
-              <entry align="center">Value</entry>
-            </row>
-          </thead>
-
-          <tbody>
-            <row>
-              <entry>VM image file</entry>
-
-              <entry><literal>centos_128t_with_ci.qcow2</literal></entry>
-            </row>
-
-            <row>
-              <entry>Image format</entry>
-
-              <entry>QCOW2</entry>
-            </row>
-
-            <row>
-              <entry>VNF Type Name</entry>
-
-              <entry>128T</entry>
-            </row>
-
-            <row>
-              <entry>Description</entry>
-
-              <entry>128T Router</entry>
-            </row>
-
-            <row>
-              <entry>Version</entry>
-
-              <entry>1.0</entry>
-            </row>
-
-            <row>
-              <entry>Memory in MB</entry>
-
-              <entry>8192. More memory can be allocated if required
-              (&lt;28672).</entry>
-            </row>
-
-            <row>
-              <entry>Num. of CPUs</entry>
-
-              <entry>2. More CPUs can be reserved if required
-              (&lt;15).</entry>
-            </row>
-
-            <row>
-              <entry>Interfaces -&gt; +</entry>
-
-              <entry>Name: mgmt</entry>
-            </row>
-
-            <row>
-              <entry>Interfaces -&gt; +</entry>
-
-              <entry>Name: wan</entry>
-            </row>
-
-            <row>
-              <entry>Interfaces -&gt; +</entry>
-
-              <entry>Name: lan</entry>
-            </row>
-
-            <row>
-              <entry>Cloud Init -&gt; Cloud-Init Datasource</entry>
-
-              <entry>ISO</entry>
-            </row>
-
-            <row>
-              <entry>Cloud Init -&gt; Cloud-Init Disk Type</entry>
-
-              <entry>cdrom</entry>
-            </row>
-
-            <row>
-              <entry>Properties -&gt; +</entry>
-
-              <entry>Name: vnfMgmtIpAddress. Value: 10.0.0.2</entry>
-            </row>
-
-            <row>
-              <entry>Properties -&gt; +</entry>
-
-              <entry>Name: internalMgmtPort. Value: 443</entry>
-            </row>
-
-            <row>
-              <entry>Properties -&gt; +</entry>
-
-              <entry>Name: externalMgmtPort. Value: 60001</entry>
-            </row>
-
-            <row>
-              <entry>Onboard</entry>
-
-              <entry>&lt;Wait for message: VNF package onboarded
-              successfully&gt;</entry>
-            </row>
-
-            <row>
-              <entry>Close</entry>
-
-              <entry></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-
-      <note>
-        <itemizedlist>
-          <listitem>
-            <para>HTTPS access (443) can be changed to another type of access.
-            Please consult official 128T documentation and make sure the 128T
-            VNF is configured to accept another type of connection before
-            changing the port number.</para>
-          </listitem>
-
-          <listitem>
-            <para><literal>externalMgmtPort(60001)</literal> represents the
-            external port on which the user can access the VNF management
-            interface from the web browser via HTTPS. The user can select
-            another port if needed. There are no other changes required or
-            components affected by this change.</para>
-          </listitem>
-
-          <listitem>
-            <para><literal>vnfMgmtIpAddress</literal> (10.0.0.2) represents
-            the IP address of the management interface of the 128T VNF.
-            Changing this value requires an update to the 128T configuration
-            to match the new IP address.</para>
-          </listitem>
-        </itemizedlist>
-      </note>
-
-      <para>Onboard the Fortigate VNF VM Image through <literal>VNF -&gt;
-      Descriptors -&gt; On-board -&gt; VM Image</literal>, and fill in the
-      required fields with the following values:</para>
-
-      <table>
-        <title>Fortigate VM Image Details</title>
-
-        <tgroup cols="2">
-          <colspec align="left" />
-
-          <colspec colwidth="2*" />
-
-          <colspec colwidth="5*" />
-
-          <thead>
-            <row>
-              <entry align="center">Field</entry>
-
-              <entry align="center">Value</entry>
-            </row>
-          </thead>
-
-          <tbody>
-            <row>
-              <entry>VM image file</entry>
-
-              <entry><literal>fortios.qcow2</literal>. Please make sure to
-              contact Fortigate for an official Fortigate KVM image.</entry>
-            </row>
-
-            <row>
-              <entry>Image format</entry>
-
-              <entry>QCOW2</entry>
-            </row>
-
-            <row>
-              <entry>VNF Type Name</entry>
-
-              <entry>Fortigate</entry>
-            </row>
-
-            <row>
-              <entry>Description</entry>
-
-              <entry>Fortigate VNF</entry>
-            </row>
-
-            <row>
-              <entry>Version</entry>
-
-              <entry>1.0</entry>
-            </row>
-
-            <row>
-              <entry>Memory in MB</entry>
-
-              <entry>1024. More memory can be allocated if required
-              (&lt;28672).</entry>
-            </row>
-
-            <row>
-              <entry>Num. of CPUs</entry>
-
-              <entry>1. More CPUs can be reserved if required
-              (&lt;15).</entry>
-            </row>
-
-            <row>
-              <entry>Interfaces -&gt; +</entry>
-
-              <entry>Name: mgmt</entry>
-            </row>
-
-            <row>
-              <entry>Interfaces -&gt; +</entry>
-
-              <entry>Name: wan</entry>
-            </row>
-
-            <row>
-              <entry>Interfaces -&gt; +</entry>
-
-              <entry>Name: lan</entry>
-            </row>
-
-            <row>
-              <entry>Cloud Init -&gt; Cloud-Init Datasource</entry>
-
-              <entry>ConfigDrive</entry>
-            </row>
-
-            <row>
-              <entry>Cloud Init -&gt; Cloud-Init Disk Type</entry>
-
-              <entry>cdrom</entry>
-            </row>
-
-            <row>
-              <entry>Cloud Init -&gt; +</entry>
-
-              <entry>Path: license</entry>
-            </row>
-
-            <row>
-              <entry>Properties -&gt; +</entry>
-
-              <entry>Name: vnfMgmtIpAddress. Value: 10.0.0.3</entry>
-            </row>
-
-            <row>
-              <entry>Properties -&gt; +</entry>
-
-              <entry>Name: internalMgmtPort. Value: 443</entry>
-            </row>
-
-            <row>
-              <entry>Properties -&gt; +</entry>
-
-              <entry>Name: externalMgmtPort. Value: 60002</entry>
-            </row>
-
-            <row>
-              <entry>Onboard</entry>
-
-              <entry>&lt;Wait for message: VNF package onboarded
-              successfully&gt;</entry>
-            </row>
-
-            <row>
-              <entry>Close</entry>
-
-              <entry></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-
-      <note>
-        <itemizedlist>
-          <listitem>
-            <para>HTTPS access (443) can be changed to another type of access.
-            Please consult official Fortigate documentation and make sure the
-            Fortigate VNF is configured to accept another type of connection
-            before changing the port number.</para>
-          </listitem>
-
-          <listitem>
-            <para><literal>externalMgmtPort</literal> (60002) represents the
-            external port on which the user can access the VNF management
-            interface from the web browser via HTTPS. The user can select
-            another port if needed. There are no other changes required or
-            components affected by this change.</para>
-          </listitem>
-
-          <listitem>
-            <para><literal>vnfMgmtIpAddress</literal> (10.0.0.3) represents
-            the IP address of the management interface of the Fortigate VNF.
-            Changing this value requires an update to the Fortigate
-            configuration to match with new IP address.</para>
-          </listitem>
-        </itemizedlist>
-      </note>
-
-      <para><emphasis role="bold">Instantiating the VNFs:</emphasis></para>
-
-      <para>Instantiate the 128T VNF by selecting the me1100 device, then
-      <literal>VNF -&gt; Instances -&gt; Add</literal>.</para>
-
-      <para>Fill in the required fields with the following values:</para>
-
-      <table>
-        <title>128T VNF Instantiation</title>
-
-        <tgroup cols="2">
-          <colspec align="left" />
-
-          <colspec colwidth="2*" />
-
-          <colspec colwidth="5*" />
-
-          <thead>
-            <row>
-              <entry align="center">Field</entry>
-
-              <entry align="center">Value</entry>
-            </row>
-          </thead>
-
-          <tbody>
-            <row>
-              <entry>Name</entry>
-
-              <entry>128T_me1100_1</entry>
-            </row>
-
-            <row>
-              <entry>VNF Type</entry>
-
-              <entry>128T</entry>
-            </row>
-
-            <row>
-              <entry>VNFD Version</entry>
-
-              <entry>1.0</entry>
-            </row>
-
-            <row>
-              <entry>Flavour</entry>
-
-              <entry>Canonical</entry>
-            </row>
-
-            <row>
-              <entry>uCPE Device</entry>
-
-              <entry>me1100</entry>
-            </row>
-
-            <row>
-              <entry>Cloud Init File</entry>
-
-              <entry><literal>centos_128t_internet_ci.iso</literal>. Example
-              image provided. Please see Appendix A for details on how to
-              change the configuration and create a new cloud-init iso
-              image.</entry>
-            </row>
-
-            <row>
-              <entry>Domain Update Script</entry>
-
-              <entry></entry>
-            </row>
-
-            <row>
-              <entry>Interfaces</entry>
-
-              <entry></entry>
-            </row>
-
-            <row>
-              <entry>ID</entry>
-
-              <entry>IF Name</entry>
-            </row>
-
-            <row>
-              <entry>mgmt (dpdk)</entry>
-
-              <entry>Bridge: vnf_mgmt_br</entry>
-            </row>
-
-            <row>
-              <entry>wan (dpdk)</entry>
-
-              <entry>Bridge: ibm_br</entry>
-            </row>
-
-            <row>
-              <entry>lan (dpdk)</entry>
-
-              <entry>Bridge: sfc_br</entry>
-            </row>
-
-            <row>
-              <entry>Create</entry>
-
-              <entry></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-
-      <para>Instantiate the Fortigate VNF by selecting the me1100 device, then
-      <literal>VNF -&gt; Instances -&gt; Add</literal>.</para>
-
-      <para>Fill in the required fields with the following values:</para>
-
-      <table>
-        <title>Fortigate VNF Instantiation</title>
-
-        <tgroup cols="2">
-          <colspec align="left" />
-
-          <colspec colwidth="2*" />
-
-          <colspec colwidth="5*" />
-
-          <thead>
-            <row>
-              <entry align="center">Field</entry>
-
-              <entry align="center">Value</entry>
-            </row>
-          </thead>
-
-          <tbody>
-            <row>
-              <entry>Name</entry>
-
-              <entry>fg_me1100_1</entry>
-            </row>
-
-            <row>
-              <entry>VNF Type</entry>
-
-              <entry>Fortigate</entry>
-            </row>
-
-            <row>
-              <entry>VNFD Version</entry>
-
-              <entry>1.0</entry>
-            </row>
-
-            <row>
-              <entry>Flavour</entry>
-
-              <entry>Canonical</entry>
-            </row>
-
-            <row>
-              <entry>uCPE Device</entry>
-
-              <entry>me1100</entry>
-            </row>
-
-            <row>
-              <entry>Cloud Init File</entry>
-
-              <entry><literal>fg_cmc_basic_fw.conf</literal></entry>
-            </row>
-
-            <row>
-              <entry>License File</entry>
-
-              <entry><literal>FGVM08TM00001.lic</literal>. Please make sure to
-              use a valid license file (.lic) received from Fortinet.</entry>
-            </row>
-
-            <row>
-              <entry>Domain Update Script</entry>
-
-              <entry></entry>
-            </row>
-
-            <row>
-              <entry>Interfaces</entry>
-
-              <entry></entry>
-            </row>
-
-            <row>
-              <entry>ID</entry>
-
-              <entry>IF Name</entry>
-            </row>
-
-            <row>
-              <entry>mgmt (dpdk)</entry>
-
-              <entry>Bridge: vnf_mgmt_br</entry>
-            </row>
-
-            <row>
-              <entry>wan (dpdk)</entry>
-
-              <entry>Bridge: sfc_br</entry>
-            </row>
-
-            <row>
-              <entry>lan (dpdk)</entry>
-
-              <entry>Bridge: lan_br</entry>
-            </row>
-
-            <row>
-              <entry>Create</entry>
-
-              <entry></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-    </section>
-
-    <section>
-      <title>Testing the Use-case</title>
-
-      <para>In order to access the web interfaces of the 128T VNF, open a
-      browser on a machine connected on the same network with the WAN port of
-      the target and connect to:
-      <literal>https://&lt;publicIP&gt;:60001</literal> using the username:
-      admin and the password: 128Tadmin.</para>
-
-      <para>In order to access the web interfaces of the Fortigate VNF, open a
-      browser on a machine connected on the same network with the WAN port of
-      the target and connect to:
-      <literal>https://&lt;publicIP&gt;:60002</literal> using the username:
-      admin, and leaving the password blank.</para>
-
-      <note>
-        <para>Make sure the WAN interface of the me1100 device has access to
-        the internet. The Fortigate VNF requires internet access to validate
-        the license.</para>
-      </note>
-
-      <para>In order to validate the data path connect a test machine to the
-      LAN physical port and check for a dynamic IP (the Fortigate LAN
-      interface is configured with a DHCP server):<programlisting>&gt; dhclient eth1
-&gt; ping 8.8.8.8</programlisting>For data path validation, a new cloud-init
-      image may need to be generated for the 128T VNF to match your network
-      configuration. Please check Appendix A "How to create 128T cloud-init
-      iso image (day-0 configuration)" for details.</para>
-    </section>
-
-    <section>
-      <title>Use-case Clean-up</title>
-
-      <para>In order to remove the setup created in previously, all components
-      need to be deleted in reverse order:</para>
-
-      <orderedlist>
-        <listitem>
-          <para>Select the <literal>me1100</literal> uCPE device -&gt; VNF
-          -&gt; Instances. Select the 128T and Fortigate VNFs -&gt;
-          Delete.</para>
-        </listitem>
-
-        <listitem>
-          <para>Select the <literal>me1100</literal> uCPE device -&gt;
-          Configuration -&gt; OpenVSwitch -&gt; Bridges. Select all bridges
-          -&gt; Delete.</para>
-        </listitem>
-
-        <listitem>
-          <para>Select the <literal>me1100</literal> uCPE device -&gt;
-          Configuration -&gt; External Interfaces -&gt; Configuration. Select
-          all interfaces -&gt; Delete.</para>
-        </listitem>
-
-        <listitem>
-          <para>VNF -&gt; Descriptors. Select all bundles -&gt;
-          Offboard.</para>
-        </listitem>
-      </orderedlist>
-    </section>
-  </section>
-</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-cmc-example-usecases/doc/usecases_autoframe.xml b/doc/book-enea-nfv-access-cmc-example-usecases/doc/usecases_autoframe.xml
deleted file mode 100644
index 9fb65a0..0000000
--- a/doc/book-enea-nfv-access-cmc-example-usecases/doc/usecases_autoframe.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<chapter id="autoframe_uc_cmc">
-  <title>Running Example Use-cases from the Automation Framework</title>
-
-  <section id="uc_one_auto_cmc">
-    <title>128T VNF Router Example Use-case</title>
-
-    <para><emphasis role="bold">Deploying the 128T VNF
-    Router</emphasis></para>
-
-    <programlisting>&gt; cd automation_and_systemtest/automation_framework/unittestSuite
-&gt; python unittestSuite.py -u admin -p admin -H &lt;uCPE_Manager_IP&gt; -n me1100-1 \
--s AddDevice_uCPEM.json -d "Add Device uCPE Manager"
-&gt; python unittestSuite.py -u admin -p admin -H &lt;uCPE_Manager_IP&gt; -n me1100-1 \
--s 128tDeploy.json -d "128T Deployment"<remark>ADCA wants to replace these last two lines.
-With what?</remark></programlisting>
-
-    <para><emphasis role="bold">Use-case Clean-up</emphasis></para>
-
-    <programlisting>&gt; python unittestSuite.py -u admin -p admin -H &lt;uCPE_Manager_IP&gt; -n me1100-1 \
--s 128tCleanup.json -d "128T Clean-up"</programlisting>
-  </section>
-
-  <section id="uc_two_auto_cmc">
-    <title>Service Chaining 128T - Fortigate Example Use-case</title>
-
-    <para><emphasis role="bold">Deploying the 128T router and Fortigate
-    VNF</emphasis></para>
-
-    <programlisting>&gt; cd automation_and_systemtest/automation_framework/unittestSuite
-&gt; python unittestSuite.py -u admin -p admin -H &lt;uCPE_Manager_IP&gt; -n me1100-1 \
--s AddDevice_uCPEM.json -d "Add Device uCPE Manager"
-&gt; python unittestSuite.py -u admin -p admin -H &lt;uCPE_Manager_IP&gt; -n me1100-1 \
--s 128t_FG_SFCDeploy.json -d "128T - Fortigate SFC Deployment" </programlisting>
-
-    <para><emphasis role="bold">Use-case Clean-up</emphasis></para>
-
-    <programlisting>&gt; python unittestSuite.py -u admin -p admin -H &lt;uCPE_Manager_IP&gt; -n me1100-1 \
--s 128t_FG_SFCCleanup.json -d "128T - Fortigate SFC CleanUp"</programlisting>
-
-    <note>
-      <para>Please replace &lt;uCPE_Manager_IP&gt; with the IP address of the
-      uCPE Manager machine.</para>
-    </note>
-  </section>
-</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-evalkit/doc/book.xml b/doc/book-enea-nfv-access-evalkit/doc/book.xml
index 04c3dea..90399a7 100644
--- a/doc/book-enea-nfv-access-evalkit/doc/book.xml
+++ b/doc/book-enea-nfv-access-evalkit/doc/book.xml
@@ -4,7 +4,7 @@
 <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED">
 ]>
 <book id="book_enea_nfv_access_evalkit">
-  <title><trademark class="registered">Enea</trademark> NFV Access EvalKit Manual</title>
+  <title><trademark class="registered">Enea</trademark> NFV Access Evaluation Kit</title>
 
   <subtitle>Release Version
          <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
diff --git a/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_overview.png b/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_overview.png
index 10984da..1367d32 100644
--- a/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_overview.png
+++ b/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_overview.png
diff --git a/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_setup.png b/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_setup.png
index 8f18afc..12e45f9 100644
--- a/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_setup.png
+++ b/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_setup.png
diff --git a/doc/book-enea-nfv-access-evalkit/doc/introduction.xml b/doc/book-enea-nfv-access-evalkit/doc/introduction.xml
index 1e84ed4..afa5fc6 100644
--- a/doc/book-enea-nfv-access-evalkit/doc/introduction.xml
+++ b/doc/book-enea-nfv-access-evalkit/doc/introduction.xml
@@ -34,7 +34,7 @@
   flexiWAN and pfSense VNFs service chained together on a uCPE device.</para>
 
   <para>This document will present all information required to replicate the
-  use case described in the user's environment. The first part of this manual
+  use case described in the user's environment. The first part of this Manual
   uses the GUI mode of the uCPE Manager to detail the steps in order to
   reproduce the use cases, while the chapters thereafter use the automation
   framework.</para>
@@ -46,7 +46,7 @@
     are described in Appendix A.</para>
 
     <para>This document assumes the user is familiar with Enea NFV Access and
-    has read the Enea NFV Access Getting Started manual before continuing with
+    has read the Enea NFV Access Getting Started Manual before continuing with
     the following.</para>
   </note>
 
diff --git a/doc/book-enea-nfv-access-evalkit/doc/prerequisites.xml b/doc/book-enea-nfv-access-evalkit/doc/prerequisites.xml
index d2254f0..fca409c 100644
--- a/doc/book-enea-nfv-access-evalkit/doc/prerequisites.xml
+++ b/doc/book-enea-nfv-access-evalkit/doc/prerequisites.xml
@@ -53,9 +53,9 @@
                 </listitem>
 
                 <listitem>
-                  <para>NFV Access installed on both uCPE devices. Please see
-                  <emphasis>Enea NFV Access Getting Started</emphasis> Manual,
-                  chapter "Getting Started with Enea NFV Access" for more
+                  <para>Enea Edge installed on both uCPE devices. Please see
+                  <emphasis>Enea Edge Getting Started</emphasis> Manual,
+                  chapter "Getting Started with Enea Edge" for more
                   details.</para>
                 </listitem>
               </itemizedlist>
diff --git a/doc/book-enea-nfv-access-evalkit/doc/run_example_uc_auto_fm.xml b/doc/book-enea-nfv-access-evalkit/doc/run_example_uc_auto_fm.xml
index d157c06..f14805b 100644
--- a/doc/book-enea-nfv-access-evalkit/doc/run_example_uc_auto_fm.xml
+++ b/doc/book-enea-nfv-access-evalkit/doc/run_example_uc_auto_fm.xml
@@ -18,7 +18,7 @@
   <note>
     <para>All tests are just examples. In order to run on user specific
     devices they need to be updated accordingly. Please check the Enea NFV
-    Access System Test Specification manual for more details.</para>
+    Access System Test Specification Manual for more details.</para>
   </note>
 
   <programlisting>&gt; cd automation_framework/unittestSuite/
diff --git a/doc/book-enea-nfv-access-evalkit/doc/sdwan_arch.xml b/doc/book-enea-nfv-access-evalkit/doc/sdwan_arch.xml
index 0fef6bb..eab7eda 100644
--- a/doc/book-enea-nfv-access-evalkit/doc/sdwan_arch.xml
+++ b/doc/book-enea-nfv-access-evalkit/doc/sdwan_arch.xml
@@ -78,19 +78,19 @@
 
       <listitem>
         <para>Install NFV Access on the uCPE devices. See the <remark>make
-        this into an olink</remark> Enea NFV Access Getting Started manual,
-        chapter Getting Started with the Enea NFV Access, for more
+        this into an olink</remark>Enea NFV Access Getting Started Manual,
+        chapter "Getting Started with the Enea NFV Access", for more
         details.</para>
       </listitem>
 
       <listitem>
-        <para>Install the uCPE Manager on the CentOS host or VM. See the
+        <para>Install the Enea uCPE Manager on the CentOS 7 host or VM. See the
         <remark>make this into an olink</remark> Enea NFV Access Getting
-        Started manual, chapter Getting Started with Enea uCPE Manager, for
+        Started Manual, chapter "Getting Started with Enea uCPE Manager", for
         more details.</para>
 
         <note>
-          <para>The uCPE Manager host machine must be connected to the network
+          <para>The Enea uCPE Manager host machine must be connected to the network
           so all uCPE devices can access it.</para>
         </note>
       </listitem>
diff --git a/doc/book-enea-nfv-access-evalkit/swcomp.mk b/doc/book-enea-nfv-access-evalkit/swcomp.mk
index 4568a23..fe11914 100755
--- a/doc/book-enea-nfv-access-evalkit/swcomp.mk
+++ b/doc/book-enea-nfv-access-evalkit/swcomp.mk
@@ -6,5 +6,5 @@ BOOK_VER ?= $(REL_VER)-dev
 DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
 
 BOOKPACKAGES := book-enea-nfv-access-evalkit
-BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access $(PROD_VER) for CMC Networks Example Use-cases"
+BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access $(PROD_VER) Evaluation Kit"
 BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt.png b/doc/book-enea-nfv-access-example-usecases/doc/images/trgt.png
deleted file mode 100644
index 791f542..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt_servicechain.png b/doc/book-enea-nfv-access-example-usecases/doc/images/trgt_servicechain.png
deleted file mode 100644
index da0824d..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt_servicechain.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_bridge.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_bridge.png
deleted file mode 100755
index 6366b61..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_bridge.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_sriov.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_sriov.png
deleted file mode 100755
index d6a8d57..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_sriov.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_enea_test_vnf.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_enea_test_vnf.png
deleted file mode 100755
index 48ff9cc..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_enea_test_vnf.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_fw.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_fw.png
deleted file mode 100755
index fe18850..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_fw.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.png
deleted file mode 100755
index cd82461..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_vnf_chaining.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_vnf_chaining.png
deleted file mode 100755
index d2527e5..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_vnf_chaining.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-getting-started/doc/advanced_configurations.xml b/doc/book-enea-nfv-access-getting-started/doc/advanced_configurations.xml
deleted file mode 100644
index 6be1205..0000000
--- a/doc/book-enea-nfv-access-getting-started/doc/advanced_configurations.xml
+++ /dev/null
@@ -1,415 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<chapter id="advanced_conf">
-  <title>Advanced Configurations</title>
-
-  <para>This chapter describes possible configurations for advanced features
-  such as the Hugepage Reservation Service customization, UEFI Secure Boot and
-  Bare Metal Provisioning.</para>
-
-  <section id="bare_meta_prov">
-    <title>Bare Metal Provisioning</title>
-
-    <para>Bare Metal Provisioning can be used for automated deployment of the
-    Enea NFV Access Runtime Platform on a large number of uCPE devices. The
-    uCPE devices may have no previous operating system installed, or are
-    reinstalled without preserving any existing data. Enea NFV Access Bare
-    Metal Provisioning is based on standardized Pre-Boot Execution environment
-    (PXE) booting.</para>
-
-    <para>The Bare Metal Provisioning process begins by PXE booting an Enea
-    NFV Access installer <literal>initramfs</literal> image. The installer
-    downloads a configuration file, as well as the Enea NFV Access Runtime
-    Platform image and then proceeds to install the system by dividing the
-    disk into 2 partitions: a GPT partition containing the GRUB boot loader
-    and a second partition containing the Enea NFV Access Runtime Platform
-    root filesystem. When the installation is complete, the uCPE device is
-    automatically rebooted into Enea NFV Access Runtime Platform.</para>
-
-    <note>
-      <para>The <literal>.hddimg</literal>, <literal>initramfs</literal>, and
-      <literal>bzImage</literal> files are available in the
-      <filename>Enea_NFV_Access_Run_Time_Platform_
-      &lt;processor&gt;_&lt;version&gt;-&lt;build_number&gt;.tar.gz</filename>
-      file you downloaded with your release.</para>
-    </note>
-
-    <section id="bare_meta_prov_prereq">
-      <title>Prerequisites</title>
-
-      <itemizedlist>
-        <listitem>
-          <para>The uCPE devices to be installed are connected in a working
-          PXE network boot environment. The PXE server can be set up using any
-          Linux distribution that includes TFTP and DHCP software packages.
-          Refer to the documentation for your distribution for setup
-          instructions.</para>
-        </listitem>
-
-        <listitem>
-          <para>An HTTP server must be available and accessible from the uCPE
-          devices in the provisioning network. Note that the installer will
-          use the same interface that the uCPE device is PXE-booted from, to
-          obtain an IP address using DHCP and access the HTTP server.</para>
-        </listitem>
-
-        <listitem>
-          <para>The uCPE devices are preconfigured in BIOS to boot from the
-          hard drive where the Enea NFV Access Runtime Platform will be
-          installed.</para>
-        </listitem>
-
-        <listitem>
-          <para>CSM support and Dual Boot must be enabled in BIOS (i.e. PXE
-          booting in legacy mode), while the final Enea NFV Access image will
-          boot in UEFI mode. Doing a mass deployment using legacy PXE booting
-          usually means that Secure Boot is disabled, Secure Boot will need to
-          be enabled afterwards.</para>
-        </listitem>
-
-        <listitem>
-          <para>A remote management tool such as <literal>ipmitool</literal>
-          (or a vendor-specific tool) is available for use to set the next
-          boot option to PXE and reboot the uCPE devices in order to begin the
-          installation.</para>
-        </listitem>
-      </itemizedlist>
-    </section>
-
-    <section id="bare_meta_prov_server">
-      <title>Server Configuration</title>
-
-      <para>The following images provided with your Enea NFV Access release
-      need to be made available on the PXE and HTTP servers:</para>
-
-      <orderedlist>
-        <listitem>
-          <para>Copy the Enea NFV Access installer
-          <literal>initramfs</literal> image and kernel
-          <literal>bzImage</literal> for your uCPE device architecture to the
-          TFTP directory on the PXE server (e.g
-          <literal>/var/lib/tftpboot</literal>).</para>
-        </listitem>
-
-        <listitem>
-          <para>Compress the Enea NFV Access Runtime Platform
-          <literal>.hddimg</literal> image for the uCPE device architecture
-          using <literal>gzip</literal> and copy the resulting
-          <literal>hddimg.gz</literal> file to the HTTP server.</para>
-        </listitem>
-      </orderedlist>
-
-      <section id="bare_meta_prov_install_config">
-        <title>Installation Configuration File</title>
-
-        <para>An installation configuration file needs to be prepared on the
-        HTTP server. The format of the configuration file is a list of
-        "<literal>name = value</literal>" pairs and the available parameters
-        are described below.</para>
-
-        <para>Mandatory parameter(s):</para>
-
-        <itemizedlist>
-          <listitem>
-            <para><literal>image_url</literal>. The HTTP server URL used for
-            downloading the Enea NFV Access Runtime Platform image.</para>
-          </listitem>
-        </itemizedlist>
-
-        <para>Optional parameters:</para>
-
-        <itemizedlist>
-          <listitem>
-            <para><literal>install_drive</literal>. The name of the drive
-            where the Enea NFV Access Runtime Platform will be installed (e.g
-            <literal>/dev/sda</literal>). If not set, the installer will use
-            the largest detected (non-USB) drive on the uCPE device.</para>
-          </listitem>
-
-          <listitem>
-            <para><literal>prompt_user</literal>. If the parameter is set to
-            "yes", the installer will ask for confirmation before formatting
-            and partitioning the drive. The default behaviour is to proceed
-            automatically without any user interaction.</para>
-          </listitem>
-        </itemizedlist>
-
-        <para>Installation Configuration File Example:</para>
-
-        <programlisting>image_url = http://192.168.1.100/enea-nfv-access-xeon-d.hddimg.gz
-install_drive = /dev/sda</programlisting>
-
-        <note>
-          <para>The installation configuration file needs to use the Linux
-          end-of-line format (\n), not the Windows format (\r\n).</para>
-        </note>
-      </section>
-
-      <section id="bare_meta_prov_pxe">
-        <title>PXE Configuration</title>
-
-        <para>A PXE entry for the Enea NFV Access installation needs to be
-        added as the default boot selection in the pxelinux configuration file
-        (e.g <literal>/var/lib/tftpboot/pxelinux.cfg/default</literal>). The
-        PXE entry should have the following settings:</para>
-
-        <programlisting>default nfv_access
-label nfv_access
-menu label ^NFV_ACCESS_INSTALLER
-kernel &lt;Path to kernel&gt;
-append root=/dev/ram0 initrd=&lt;Path to initramfs&gt; LABEL=pxe-installer \
-   INSTALL_CFG=http://&lt;Server IP&gt;/&lt;Path to install config file&gt; \
-   console=ttyS0,115200 earlyprintk=ttyS0,115200
-ipappend 2</programlisting>
-      </section>
-    </section>
-
-    <section id="bare_meta_prov_inst">
-      <title>Starting the Installation</title>
-
-      <para>To initiate the installation, set the boot device (for next boot
-      only) to PXE and reboot the uCPE devices. How to do this depends on the
-      remote management capabilities of the uCPE devices and may require
-      vendor-specific tools.</para>
-
-      <para>Example initiation using <literal>ipmitool</literal>:</para>
-
-      <programlisting>ipmitool -U &lt;user&gt; -P &lt;password&gt; -H &lt;uCPE device IPMI IP address&gt; chassis bootdev pxe
-ipmitool -U &lt;user&gt; -P &lt;password&gt; -H &lt;uCPE device IPMI IP address&gt; power reset   </programlisting>
-
-      <para>The uCPE devices should be configured in BIOS to boot from the
-      installation drive first in order to automatically start the Enea NFV
-      Access Runtime Platform when the installation is finished.</para>
-    </section>
-  </section>
-
-  <section id="uefi_secure_boot">
-    <title>UEFI Secure Boot</title>
-
-    <para>Secure Boot was designed to enhance security in the pre-boot
-    environment. It prevents malicious software and applications from being
-    loaded during the system start-up process.</para>
-
-    <para>The basic principle of UEFI Secure Boot is that it requires all
-    artifacts involved in the boot process (bootloaders, kernel, initramfs) to
-    be signed using a set of private keys. On a Secure Boot enabled uCPE
-    device these artifacts are checked against a set of public certificates
-    which correspond to these keys. If there are any mismatches the boot
-    process will fail at the stage(s) they are detected.</para>
-
-    <para>For more information about Secure Boot please refer to <ulink
-    url="https://www.uefi.org/sites/default/files/resources/UEFI_Secure_Boot_in_Modern_Computer_Security_Solutions_2013.pdf">Secure
-    Boot in Modern Computer Security Solutions</ulink>.</para>
-
-    <section id="secure_boot_keys">
-      <title>Enabling UEFI Secure Boot</title>
-
-      <para>All Enea NFV Access image artifacts delivered with the release are
-      signed using the Enea UEFI Secure boot private keys. These artifacts can
-      be used on a uCPE device that doesn't have Secure Boot enabled. To use
-      the Secure Boot feature, however, the user must make the Enea UEFI
-      Secure Boot public certificates available on the uCPE device before
-      enabling the feature in BIOS. This process is called
-      "Provisioning".</para>
-
-      <section id="manual_key_provisioning">
-        <title>Provisioning the Enea UEFI Secure Boot Certificates</title>
-
-        <para>The UEFI firmware is normally shipped with factory preloaded
-        certificates. If these do not already include Certificates from Enea,
-        they will need to be appended or replaced with the Enea
-        Certificates.</para>
-
-        <para><emphasis role="bold">UEFI Secure Boot certificates provided
-        with your release:</emphasis></para>
-
-        <itemizedlist>
-          <listitem>
-            <para><literal>Platform Key (PK)</literal>: this key protects the
-            next key from uncontrolled modification. Once this key is
-            enrolled, Secure Boot enters into <literal>User Mode</literal>.
-            The drivers and loaders signed with the <literal>Platform
-            Key</literal> can then be loaded by the firmware.</para>
-          </listitem>
-
-          <listitem>
-            <para><literal>Key Exchange key (KEK)</literal>: this key allows
-            other certificates which have a connection to the private portion
-            of the <literal>Platform Key</literal> to be used.</para>
-          </listitem>
-
-          <listitem>
-            <para><literal>Authorized Signature (DB)</literal>: contains the
-            <literal>trusted keys</literal> used for authenticating any
-            drivers or applications executed in the UEFI environment.</para>
-          </listitem>
-        </itemizedlist>
-
-        <para>The Enea UEFI Secure Boot certificates are installed together
-        with the Enea NFV Access Runtime Platform onto the hard drive. They
-        can be found on the EFI partition (usually the first partition of the
-        drive) under <literal>/uefi_sb_keys</literal>.</para>
-
-        <para>These certificates need to be manually enrolled in BIOS. The
-        exact details on how to proceed may vary depending the version of the
-        UEFI firmware.</para>
-
-        <para>The UEFI firmware is normally shipped with factory preloaded
-        certificates. If these do not already include Certificates from Enea,
-        they will need to be appended or replaced with the Enea
-        Certificates.</para>
-      </section>
-
-      <section id="enable_secure_boot">
-        <title>Enabling Secure Boot in BIOS</title>
-
-        <para>Once the certificates are enrolled, Secure Boot needs to be
-        enabled in BIOS and the device rebooted.</para>
-      </section>
-    </section>
-  </section>
-
-  <section id="hugepage_reservation">
-    <title>Hugepage Reservation Service</title>
-
-    <para>Enea NFV Access implements an automatic hugepage allocation service
-    that is triggered at each startup. The service is skipped if hugepages
-    have been allocated in the kernel boot command line.</para>
-
-    <para>There are two strategies outlined for hugepage allocation:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>If a system has an amount of memory up to 8GB, the allocation
-        algorithm will reserve up to 30% (no more than 2GB), for the OS and
-        the rest as 2MB hugepages.</para>
-      </listitem>
-
-      <listitem>
-        <para>If a system has an amount of memory that's higher than 8GB, the
-        allocation algorithm will reserve all but 2GB of memory as 1GB
-        hugepages, leaving the rest (2GB) to be used by the OS.</para>
-      </listitem>
-    </itemizedlist>
-
-    <note>
-      <para>This is a best effort reservation after kernel boot, so the
-      results may vary accordingly.</para>
-    </note>
-
-    <section id="hugepage_customizing_auto">
-      <title>Customizing Automatic Hugepage Reservation</title>
-
-      <para>Configuration of Hugepage reservation is done in
-      <literal>/etc/enea-nfv-access/hugepages.cfg</literal>.</para>
-
-      <para><emphasis role="bold">Parameters used by the automatic algorithm:
-      </emphasis></para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para><literal>hugepage_setup</literal>: Enables the automatic
-          configuraiton algorithm. It has only one value,
-          <literal>auto</literal>. For manual configuration comment or remove
-          this parameter. Use the other parameter descriptions as a
-          template/example.</para>
-        </listitem>
-
-        <listitem>
-          <para><literal>threshold_to_use_1g</literal>: Decides the threshold
-          which instructs the algorithm to use 1GB hugepages. If a system's
-          memory is higher than <literal>threshold_to_use_1g</literal>, then
-          the algorithm will use 1GB hugepages, otherwise it will use 2MB
-          hugepages.</para>
-        </listitem>
-
-        <listitem>
-          <para><literal>percent_os_alloc</literal>: Decides how much memory
-          to try to reserve for userspace applications. The algorithm will try
-          to reserve at least the value of <literal>percent_os_alloc</literal>
-          of the total system memory for userspace applications.</para>
-        </listitem>
-
-        <listitem>
-          <para><literal>maximum_os_alloc_mb</literal>: Maximum amount of
-          memory to allocate for userspace applications. If
-          <literal>percent_os_alloc</literal> of the total system memory
-          exceeds <literal>maximum_os_alloc_mb</literal> then the maximum
-          allocated memory for userspace applications is
-          <literal>maximum_os_alloc_mb</literal>.</para>
-        </listitem>
-      </itemizedlist>
-
-      <para><emphasis role="bold">Example of automatic Hugepage
-      Configuration:</emphasis></para>
-
-      <programlisting>hugepage_setup = auto
-threshold_to_use_1g = 8192
-percent_os_alloc = 30
-maximum_os_alloc_mb = 2048</programlisting>
-
-      <para>The following possible allocations can result (based on total
-      system memory available):</para>
-
-      <itemizedlist>
-        <listitem>
-          <para>2GB of memory: approximately 30% will be allocated for the OS
-          and the rest will be allocated as 2MB hugepages.</para>
-        </listitem>
-
-        <listitem>
-          <para>4GB of memory: approximately 30% will be allocated for the OS
-          and the rest will be allocated as 2MB hugepages.</para>
-        </listitem>
-
-        <listitem>
-          <para>16GB of memory: approximately 2GB will be allocated for the OS
-          and the rest as 1GB hugepages.</para>
-        </listitem>
-      </itemizedlist>
-
-      <note>
-        <para>The memory allocated for the kernel and hugepages might vary
-        slightly depending on how much memory is available.</para>
-      </note>
-    </section>
-
-    <section id="hugepage_customizing_man">
-      <title>Customizing Manual Hugepage Reservation</title>
-
-      <para>The automatic algorithm can be disabled and hugepages in turn,
-      configured manually. To do this, comment the line which defines
-      <literal>hugepage_setup</literal> as <literal>auto</literal> and
-      configure memory for each CPU socket in the following manner:</para>
-
-      <programlisting>&lt;NUMA node&gt;.&lt;hugepage size&gt; = &lt;number of pages&gt;</programlisting>
-
-      <para>Where <literal>&lt;NUMA node&gt;</literal> refers to a node which
-      is part of the system's NUMA topology, <literal>&lt;hugepage
-      size&gt;</literal> decides what type of hugepages should be set and
-      <literal>&lt;number of hugepages&gt;</literal> is how many hugepages of
-      <literal>&lt;hugepage size&gt;</literal> should be allocated.</para>
-
-      <para>To list the available system nodes, run:</para>
-
-      <programlisting>ls -d /sys/devices/system/node/node* </programlisting>
-
-      <para>To list available hugepage sizes, per node, run:</para>
-
-      <programlisting>ls -d /sys/devices/system/node/node*/hugepages/hugepages-*</programlisting>
-
-      <para>Example of Manual Hugepage Configuration, configuring the system
-      to allocate three 1GB hugepages and 512 of 2MB hugepages on node:</para>
-
-      <programlisting>node0.2048kB = 512
-node0.1048576kB = 3 </programlisting>
-
-      <note>
-        <para>Make sure there are no hugepages reserved in the kernel boot
-        command line, these will override any manual configuration done in the
-        service.</para>
-      </note>
-    </section>
-  </section>
-</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-getting-started/doc/book.xml b/doc/book-enea-nfv-access-getting-started/doc/book.xml
deleted file mode 100644
index d148f3b..0000000
--- a/doc/book-enea-nfv-access-getting-started/doc/book.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED">
-]>
-<book id="book_enea_nfv_access_getting_started">
-  <title><trademark class="registered">Enea</trademark> NFV Access Getting Started</title>
-
-  <subtitle>Release Version
-         <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
-         xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
-
-  <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
-
-  <xi:include href="../../s_docbuild/template/docsrc_common/bookinfo_userdoc.xml"
-              xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-  <xi:include href="introduction.xml"
-              xmlns:xi="http://www.w3.org/2001/XInclude" />
-                          
-  <xi:include href="installation_guide.xml"
-                xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-  <xi:include href="upgrade_ena.xml"
-                xmlns:xi="http://www.w3.org/2001/XInclude" />
-                                
-  <xi:include href="advanced_configurations.xml"
-              xmlns:xi="http://www.w3.org/2001/XInclude" />
-                                
-  <xi:include href="net_config_options.xml"
-                xmlns:xi="http://www.w3.org/2001/XInclude" />
-                                
-  <xi:include href="vnf_mg.xml"
-                xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-  <xi:include href="log_collector.xml"
-                xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-  <xi:include href="troubleshooting.xml"
-                xmlns:xi="http://www.w3.org/2001/XInclude" />
-</book>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/vnf_space.png b/doc/book-enea-nfv-access-getting-started/doc/images/vnf_space.png
deleted file mode 100755
index 1a5ddab..0000000
--- a/doc/book-enea-nfv-access-getting-started/doc/images/vnf_space.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-getting-started/doc/installation_guide.xml b/doc/book-enea-nfv-access-getting-started/doc/installation_guide.xml
deleted file mode 100644
index b82d48b..0000000
--- a/doc/book-enea-nfv-access-getting-started/doc/installation_guide.xml
+++ /dev/null
@@ -1,1010 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<chapter id="installation_guide">
-  <title>Setting up and Installing the Enea NFV Access Base
-  Configuration</title>
-
-  <para>The setup and installation steps detailed below will deploy a base
-  configuration which will be used as a reference for more complex deployment
-  scenarios.</para>
-
-  <section id="hw_reqs">
-    <title>Hardware Requirements</title>
-
-    <para>The following hardware is needed for deploying the base
-    configuration:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>One server running the CentOS 7 distribution</para>
-
-        <para>Minimal Requirement: 4 Cores, 16 GB RAM and 300 GB single disk
-        storage. Make sure the CentOS 7 server is updated to the latest
-        revision before installing Enea NFV Access.</para>
-
-        <para>The purpose of the CentOS 7 server is to host the Enea uCPE
-        Manager. Network access between the CentOS 7 server and the uCPE
-        devices is required. The Enea uCPE Manager and the uCPE devices will
-        be connected on separate subnets to avoid inconsistencies.</para>
-      </listitem>
-
-      <listitem>
-        <para>One or more uCPE devices.</para>
-
-        <para>Whitebox devices where the Enea NFV Access Runtime Platform
-        will be installed, containing a minimum of 2 cores and 4 GB RAM and at
-        least two ethernet ports that will be configured as WAN and LAN during
-        deployment.</para>
-
-        <para>When hosting an entire solution including one or several network
-        services, the hardware must also have the resources to host one or
-        more VNFs. During a typical evaluation, a dual VNF service on the Enea
-        NFV Access Runtime Platform needs a CPU with 4-8 cores and at least 8
-        GB RAM. The supported Intel CPUs of Enea NFV Access are documented in
-        the <xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
-        xmlns:xi="http://www.w3.org/2001/XInclude"
-        xpointer="element(book_enea_nfv_access_release_info/1)" />
-        manual.</para>
-
-        <para>Enea NFV Access needs EFI support in BIOS to boot. When
-        configuring the uCPE device BIOS a serial connection is
-        required.</para>
-      </listitem>
-
-      <listitem>
-        <para>A laptop.</para>
-
-        <para>The laptop is used for 2 scenarios:</para>
-
-        <itemizedlist>
-          <listitem>
-            <para>Installing the Enea NFV Access Runtime Platform on uCPE
-            Devices.</para>
-          </listitem>
-
-          <listitem>
-            <para>Connecting to the GUI of the Enea uCPE Manager for
-            management and configuration. Network access between the CentOS 7
-            server and the laptop is required. Please see the <xi:include
-            href="../../s_docbuild/olinkdb/pardoc-common.xml"
-            xmlns:xi="http://www.w3.org/2001/XInclude"
-            xpointer="element(book_enea_nfv_access_release_info/1)" /> manual
-            available with your release, for recommended browsers.</para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-
-      <listitem>
-        <para>A 16 GB USB stick used for the uCPE Device Installation.</para>
-      </listitem>
-    </itemizedlist>
-  </section>
-
-  <section id="sw_config">
-    <title>Software Configuration</title>
-
-    <para>The CentOS 7 server requires a specific configuration for the setup
-    to work.</para>
-
-    <section id="firewall_config">
-      <title>Firewall Configuration</title>
-
-      <para>Any firewall running on the CentOS 7 server may block the
-      management protocols required to communicate between the uCPE device and
-      the Enea uCPE Manager as well as between the Enea uCPE Manager and its
-      northbound clients. Quick handling of a blocking firewall would be to
-      disable it, typical for a lab environment, through:</para>
-
-      <programlisting>sudo systemctl stop firewalld
-sudo systemctl disable firewalld
-sudo systemctl mask now firewalld</programlisting>
-
-      <para>For an advanced firewall configuration, the following ports need
-      to be opened:</para>
-
-      <table>
-        <title>Ports to be Activated</title>
-
-        <tgroup cols="3">
-          <colspec align="left" />
-
-          <tbody>
-            <row>
-              <entry>80</entry>
-
-              <entry>TCP</entry>
-
-              <entry>Required for GUI Access.</entry>
-            </row>
-
-            <row>
-              <entry>443</entry>
-
-              <entry>TCP</entry>
-
-              <entry>Required for GUI Access and Device Connectivity.</entry>
-            </row>
-
-            <row>
-              <entry>54327</entry>
-
-              <entry>UDP</entry>
-
-              <entry>Required for the Enea uCPE Manager High Availability
-              Configuration.</entry>
-            </row>
-
-            <row>
-              <entry>5701:5708</entry>
-
-              <entry>TCP</entry>
-
-              <entry>Required for the Enea uCPE Manager High Availability
-              Configuration.</entry>
-            </row>
-
-            <row>
-              <entry>4334</entry>
-
-              <entry>TCP</entry>
-
-              <entry>Required for Call Home.</entry>
-            </row>
-
-            <row>
-              <entry>2021:2040</entry>
-
-              <entry>TCP</entry>
-
-              <entry>Required for Call Home.</entry>
-            </row>
-
-            <row>
-              <entry>7000:7010</entry>
-
-              <entry>TCP</entry>
-
-              <entry>Required for Reverse SSH.</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-
-      <para>Use the following command sequence to enable the required ports
-      for deployment of the Enea uCPE Manager:</para>
-
-      <programlisting>sudo firewall-cmd --permanent --add-port=80/tcp
-sudo firewall-cmd --permanent --add-port=443/tcp
-sudo firewall-cmd --permanent --add-port=54327/udp
-sudo firewall-cmd --permanent --add-port=5701-5708/tcp
-sudo firewall-cmd --permanent --add-port=4334/tcp
-sudo firewall-cmd --permanent --add-port=2021-2040/tcp
-sudo firewall-cmd --permanent --add-port=7000-7010/tcp
-sudo firewall-cmd --reload</programlisting>
-    </section>
-
-    <section id="openjdk_postgresql_config">
-      <title>Configuring OpenJDK and PostgreSQL</title>
-
-      <para>The Enea uCPE Manager requires a specific Java version (OpenJDK
-      11) and a PostgreSQL version to operate correctly.</para>
-
-      <para><emphasis role="bold">Installing OpenJDK</emphasis></para>
-
-      <orderedlist>
-        <listitem>
-          <para>Install OpenJDK 11 using the root account:</para>
-
-          <programlisting>yum install java-11-openjdk-devel</programlisting>
-        </listitem>
-
-        <listitem>
-          <para>Verify the installation:</para>
-
-          <programlisting>java -version 
-openjdk version "11.0.3" 2019-04-16 LTS 
-OpenJDK Run Time Environment 18.9 (build 11.0.3+7-LTS) 
-OpenJDK 64-Bit Server VM 18.9 (build 11.0.3+7-LTS, mixed mode, sharing) </programlisting>
-
-          <note>
-            <para>If there are multiple java versions installed, switch
-            between them using the following command:</para>
-
-            <programlisting>alternatives --config java</programlisting>
-
-            <para>Optionally, the user can switch between the
-            <literal>javac</literal> versions using:</para>
-
-            <programlisting>alternatives --config javac</programlisting>
-          </note>
-        </listitem>
-
-        <listitem>
-          <para>The following system variables need to point to the OpenJDK 11
-          installation:</para>
-
-          <programlisting>export JAVA_HOME=$(dirname $(dirname $(readlink $(readlink $(which java)))))
-export PATH=$PATH:$JAVA_HOME/bin 
-export CLASSPATH=.:$JAVA_HOME/jre/lib:$JAVA_HOME/lib:$JAVA_HOME/lib/tools.jar</programlisting>
-
-          <note>
-            <para>In order to make these system variables persistent, the
-            commands given above should be added to a script in the
-            <literal>/etc/profile.d/</literal> folder. <emphasis
-            role="bold">Sudo</emphasis> access is needed for this
-            operation.</para>
-          </note>
-        </listitem>
-      </orderedlist>
-
-      <para>The Enea uCPE Manager requires a specific PostgreeSQL version.
-      This is embedded in the Enea uCPE Manager installation. In order to
-      avoid conflicts, any existing PostgreeSQL installation needs to be
-      uninstalled.</para>
-
-      <para><emphasis role="bold">Uninstalling PostgreSQL</emphasis></para>
-
-      <orderedlist>
-        <listitem>
-          <para>Open a terminal with administrative rights, i.e. log into a
-          bash shell with root privileges.</para>
-        </listitem>
-
-        <listitem>
-          <para>Execute the following command to check if you have a currently
-          running the PostgreSQL database server:</para>
-
-          <programlisting>ps -ef | grep post</programlisting>
-        </listitem>
-
-        <listitem>
-          <para>Remove the currently installed PostgreSQL server (including
-          the existing postgres user):</para>
-
-          <programlisting>yum remove postgres\*
-rm -rf /var/lib/pgsql
-rm -f /etc/postgres-reg.ini
-userdel postgres</programlisting>
-
-          <note>
-            <para>This step is not necessary if the Enea uCPE Manager will be
-            using an external database (like MariaDB).</para>
-          </note>
-        </listitem>
-      </orderedlist>
-
-      <para>If you have multiple spindles, it is recommended to let the
-      application run off one and the database off the other. This will result
-      in optimum performance. It is also recommended that the swap disk be the
-      same as the one used for the application.</para>
-
-      <para>Assuming another spindle is used (<literal>/drive2</literal>) do
-      the following:</para>
-
-      <orderedlist>
-        <listitem>
-          <para>Create a folder which will host the database (e.g.
-          <literal>emsDatabase</literal>).</para>
-        </listitem>
-
-        <listitem>
-          <para>Create a soft-link that will point to this folder:</para>
-
-          <programlisting>ln -s /opt/ems/elementcenter/database /drive2/emsDatabase</programlisting>
-        </listitem>
-
-        <listitem>
-          <para>Follow the installation steps for the Enea uCPE Manager
-          available in <olink targetdoc="book_enea_nfv_access_getting_started"
-          targetptr="install_ucpe_mg">Installing the uCPE Manager in the
-          <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
-          xmlns:xi="http://www.w3.org/2001/XInclude"
-          xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
-          Manual.</para>
-        </listitem>
-      </orderedlist>
-    </section>
-  </section>
-
-  <section id="ucpe_config">
-    <title>uCPE Device Configuration</title>
-
-    <section id="wan_lan_ports">
-      <title>Determining the WAN and LAN ports</title>
-
-      <para>A typical whitebox comes with multiple physical network ports,
-      ready to be used. The user must determine the purpose and allocation of
-      each port. The allocation is later aligned with the software
-      configuration within the Enea NFV Access installer.</para>
-
-      <para>A common way is to allocate the left ports to WANs and the right
-      ports to LANs. At least one port must be allocated to WAN and one to
-      LAN.</para>
-    </section>
-
-    <section id="ucpe_identifier">
-      <title>Determining the Device ID</title>
-
-      <para>Each uCPE device needs a unique identifier. This identifier is
-      used to match the registration in the Enea uCPE Manager and the offline
-      configuration of the uCPE device during ZTP (Zero Touch
-      Provisioning)</para>
-
-      <para>Select a text string to represent the uCPE device, e.g.
-      <literal>uCPE-1</literal> or
-      <literal>fwa-t1012vc_boston_1234</literal>.</para>
-    </section>
-
-    <section id="bios_config">
-      <title>Configuring the BIOS</title>
-
-      <para>The factory configuration of the BIOS may not match the
-      requirements of Enea NFV Access. The BIOS configuration needs to be
-      reviewed and potentially reconfigured to prepare for a successful
-      installation.</para>
-
-      <para>Access the BIOS using a serial cable between the uCPE device and
-      the laptop, to review and configure the BIOS correctly. The whitebox
-      vendor is expected to provide the right serial cable for the box. A
-      terminal emulator (such as putty) is needed on the laptop.</para>
-
-      <para>Enable the following BIOS features/configurations:</para>
-
-      <itemizedlist>
-        <listitem>
-          <para>EFI</para>
-        </listitem>
-
-        <listitem>
-          <para>Intel Virtualization Technology (VT-x)</para>
-        </listitem>
-
-        <listitem>
-          <para>Intel Virtualization Technology for Directed I/O (VT-d)</para>
-        </listitem>
-
-        <listitem>
-          <para>SR-IOV</para>
-        </listitem>
-      </itemizedlist>
-
-      <para>The boot order may also need to be modified to support
-      installation and execution of the Enea NFV Access Runtime Platform on
-      the uCPE device.</para>
-
-      <para>The following boot order is recommended for a base
-      configuration:</para>
-
-      <orderedlist>
-        <listitem>
-          <para>Boot from USB</para>
-        </listitem>
-
-        <listitem>
-          <para>Boot from Disk</para>
-        </listitem>
-      </orderedlist>
-
-      <para>With the above boot order there is no need for a configuration of
-      the BIOS during installation and deployment.</para>
-    </section>
-  </section>
-
-  <section id="prep_deploy">
-    <title>Preparing the Deployment</title>
-
-    <section id="install_ucpe_mg">
-      <title>Installing the Enea uCPE Manager</title>
-
-      <para>The Enea uCPE Manager can be installed using as a fresh/first-time
-      configuration or using a backup file of a previous installation, created
-      within the Enea uCPE Manager GUI.</para>
-
-      <section id="fresh_ucpemg_install">
-        <title>Fresh Installation of the Enea uCPE Manager</title>
-
-        <para>On the CentOS 7 server open a terminal, log into a bash shell
-        with the root account and perform the following:</para>
-
-        <orderedlist>
-          <listitem>
-            <para>Extract
-            <literal>Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</literal></para>
-
-            <para>The directory in which the archive has been unpacked will be
-            denoted as: <literal>&lt;uCPEM-installdir&gt;</literal>.</para>
-          </listitem>
-
-          <listitem>
-            <para>Enter <literal>&lt;uCPEM-installdir&gt;</literal>.</para>
-          </listitem>
-
-          <listitem>
-            <para>Choose the target installation folder, e.g.
-            <literal>/opt/ems</literal>. Everything will be installed under a
-            folder called <literal>/ucpemanager</literal> within the target
-            installation folder.</para>
-
-            <para>The application files will be installed in
-            <literal>/opt/ems/ucpemanager/application</literal>. The database
-            will be installed in
-            <literal>/opt/ems/ucpemanager/database</literal>.</para>
-          </listitem>
-
-          <listitem>
-            <para>Run the following interactive command:</para>
-
-            <programlisting>./install.sh /opt/ems \
-Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</programlisting>
-
-            <para>The default configuration values are specified in brackets.
-            If no other value is preferred and typed in, pressing
-            <literal>ENTER</literal> will keep the default values. When there
-            is an option within parentheses (i.e.Y/N), a value must be
-            specified.</para>
-
-            <note>
-              <para>The same configuration values set now will need to be
-              provided when upgrading or uninstalling the Enea uCPE
-              Manager.</para>
-            </note>
-
-            <itemizedlist>
-              <listitem>
-                <para>Database Configurations:</para>
-
-                <itemizedlist spacing="compact">
-                  <listitem>
-                    <para>Are you using the embedded PostgreSQL database?
-                    [Y/N]: <literal>Y</literal>.</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>Specify the database process password
-                    <literal>[postgres]:</literal></para>
-                  </listitem>
-
-                  <listitem>
-                    <para>Specify the database ID (or name)
-                    <literal>[ucpemanager]:</literal></para>
-                  </listitem>
-
-                  <listitem>
-                    <para>Specify the database server port
-                    <literal>[5432]:</literal></para>
-                  </listitem>
-
-                  <listitem>
-                    <para>Specify a database user name
-                    <literal>[postgres]:</literal></para>
-                  </listitem>
-
-                  <listitem>
-                    <para>Specify a database password
-                    <literal>[postgres]:</literal></para>
-                  </listitem>
-
-                  <listitem>
-                    <para>Specify the database startup thread pool size
-                    <literal>[1]:</literal></para>
-                  </listitem>
-                </itemizedlist>
-              </listitem>
-
-              <listitem>
-                <para>Service Configurations:</para>
-
-                <itemizedlist spacing="compact">
-                  <listitem>
-                    <para>Specify a service username
-                    [<literal>ucpemanager</literal>]:</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>Specify a service password
-                    <literal>[ucpemanager</literal>]:</para>
-                  </listitem>
-                </itemizedlist>
-              </listitem>
-
-              <listitem>
-                <para>High Availability Configurations:</para>
-
-                <itemizedlist spacing="compact">
-                  <listitem>
-                    <para>Specify the IP address of the local interface: The
-                    CentOS 7 Server loopback address:
-                    <literal>127.0.0.1</literal>.</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>Is this server part of a cluster? [Y/N]:
-                    <literal>N</literal>.</para>
-                  </listitem>
-                </itemizedlist>
-              </listitem>
-
-              <listitem>
-                <para>Heap Configuration:</para>
-
-                <itemizedlist spacing="compact">
-                  <listitem>
-                    <para>Please enter the new Maximum Heap Size
-                    [<literal>4g]</literal>:</para>
-                  </listitem>
-                </itemizedlist>
-              </listitem>
-            </itemizedlist>
-
-            <para>This command will:</para>
-
-            <itemizedlist spacing="compact">
-              <listitem>
-                <para>Extract the application files from the compressed
-                installation kit.</para>
-              </listitem>
-
-              <listitem>
-                <para>Install the bundled database.</para>
-              </listitem>
-
-              <listitem>
-                <para>Install the Enea uCPE Manager as a service with the name
-                <literal>ucpemanager</literal>.</para>
-              </listitem>
-
-              <listitem>
-                <para>Start the <literal>ucpemanager</literal> service</para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-
-          <listitem>
-            <para>Using the IPv4 address of the CentOS 7 Server in a web
-            browser, running on the laptop, log into the Enea uCPE Manager GUI
-            using the default username and password:
-            <literal>admin/admin</literal>.</para>
-          </listitem>
-        </orderedlist>
-
-        <note>
-          <para>The IPv4 address of the CentOS 7 Server, connected to the same
-          network as the uCPE Devices, will be used as a configuration
-          parameter both when setting up the uCPE devices.</para>
-        </note>
-      </section>
-
-      <section id="install_ucpemg_from_backup">
-        <title>Installation of the Enea uCPE Manager using a System
-        Back-up</title>
-
-        <para>The Enea uCPE Manager can be restored if a back-up file has been
-        previously created.</para>
-
-        <para>A backup file can be created by accessing:
-        <literal>System</literal> -&gt; <literal>System Backup</literal> from
-        the Enea uCPE Manager GUI. The resulting zip archive will be located
-        in the <filename>/opt/ems/ucpemanager/application/backup</filename>
-        folder and will be named
-        <literal>SystemBackup_MMMDD_YYYY_HHMM_SS.zip</literal> (e.g
-        System-Backup_Feb19_2013_2257_42.zip). Save the archive to another
-        location outside the Enea uCPE Manager installation folder for future
-        use.</para>
-
-        <note>
-          <para>The System Back-up file obtained from the Enea uCPE Manager
-          GUI (<filename>SystemBackup_MMMDD_YYYY_HHMM_SS.zip</filename>) is
-          different from the Enea uCPE Manager snapshot obtained during a Enea
-          uCPE Manager Upgrade or Uninstall operation
-          (<filename>ucpemanager-Backup-YYYYddMMHHmm.tar.gz</filename>) needed
-          for recovery of the Enea uCPE Manager. For more details please see
-          <olink targetdoc="book_enea_nfv_access_getting_started"
-          targetptr="restore_prev_ucpe_install">Restoring a previous uCPE
-          Manager installation in the <xi:include
-          href="../../s_docbuild/olinkdb/pardoc-names.xml"
-          xmlns:xi="http://www.w3.org/2001/XInclude"
-          xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
-          Manual.</para>
-        </note>
-
-        <para>To install the Enea uCPE Manager with the restore option provide
-        an additional argument as shown below during installation:</para>
-
-        <programlisting>./install.sh \
-/opt/ems Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz \
-SystemBackup_MMMDD_YYYY_HHMM_SS.zip</programlisting>
-      </section>
-    </section>
-
-    <section id="prep_usb_ena">
-      <title>Preparing the USB stick for installation of the Enea NFV Access
-      Runtime Platform</title>
-
-      <para>To install the Enea NFV Access Runtime Platform, create a
-      bootable USB stick with the image you intend to install.</para>
-
-      <para>In the example below, step by step instructions are provided for
-      the CentOS 7 distribution. It's possible with the appropriate tools to
-      also use Windows OS or MacOS.</para>
-
-      <note>
-        <para>The .hddimg image is available in the
-        <filename>Enea_NFV_Access_Run_Time_Platform_
-        &lt;processor&gt;_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename>
-        file you downloaded with your release.</para>
-      </note>
-
-      <para><emphasis role="bold">Create a bootable USB stick
-      image</emphasis></para>
-
-      <orderedlist>
-        <listitem>
-          <para>Copy the <filename>.hddimg</filename> image file provided by
-          Enea, into the CentOS 7 server.</para>
-        </listitem>
-
-        <listitem>
-          <para>Connect the USB stick to the CentOS 7 Server and identify the
-          USB device name given by the system with
-          <literal>lsblk</literal>:</para>
-
-          <programlisting>NAME    MAJ:MIN  RM   SIZE    RO  TYPE   MOUNTPOINT
-sda       8:0    1    28.7G   0   disk
-sdb       8:0    0    111.8G  0   disk
-|-sdb1    8:1    0    111.8G  0   part</programlisting>
-        </listitem>
-
-        <listitem>
-          <para>Copy the <filename>.hddimg</filename> image onto the USB
-          stick, e.g:</para>
-
-          <programlisting>sudo dd if=./enea-nfv-access-&lt;machine&gt;.hddimg \
-of=/dev/sdb bs=4M conv=fsync</programlisting>
-
-          <para>Where
-          <filename>enea-nfv-access-&lt;machine&gt;.hddimg</filename> is the
-          <filename>.hddimg</filename> file and <literal>sdb</literal> is the
-          assigned USB device name.</para>
-        </listitem>
-      </orderedlist>
-    </section>
-
-    <section id="prep_phys_deploy">
-      <title>Preparing Physical Deployment for Installation</title>
-
-      <figure>
-        <title>Preparing for Hardware Installation</title>
-
-        <mediaobject>
-          <imageobject>
-            <imagedata contentwidth="600" fileref="images/prep_deploy.png" />
-          </imageobject>
-        </mediaobject>
-      </figure>
-
-      <para>While the uCPE device is powered off, in order to install and
-      configure the Enea NFV Access Runtime using the prepared USB stick,
-      connect the laptop to a uCPE device LAN port. For this purpose, a Layer
-      2 switch or direct cable connection can be used.</para>
-    </section>
-
-    <section id="install_ena_device">
-      <title>Installing Enea NFV Access - uCPE Device Installation</title>
-
-      <para>To initiate the installation of the Enea NFV Access Runtime
-      Platform do the following:</para>
-
-      <orderedlist>
-        <listitem>
-          <para>Plug the USB stick into the uCPE device.</para>
-        </listitem>
-
-        <listitem>
-          <para>Power up the uCPE device and boot the USB stick.</para>
-        </listitem>
-
-        <listitem>
-          <para>The Web-installer application will start automatically and can
-          be accessed in a web browser on the laptop at
-          <literal>http://172.16.1.1</literal> (port 80).</para>
-        </listitem>
-
-        <listitem>
-          <para>On the first page of the Web-installer, the user must fill
-          in:</para>
-
-          <itemizedlist>
-            <listitem>
-              <para>The static Enea uCPE Manager IP Address.</para>
-            </listitem>
-
-            <listitem>
-              <para>The unique identifier of the uCPE device (called
-              "DeviceId" in this guide).</para>
-            </listitem>
-
-            <listitem>
-              <para>Customer Tags. They are used for Zero Touch Provisining
-              (ZTP) and can be left empty for a base configuration. What can
-              be entered here (if needed), are the tag(s) specified when
-              creating an offline configuration in the Enea uCPE Manager. A
-              later addition of customer tags can only be done by reinstalling
-              the uCPE devices.</para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
-
-        <listitem>
-          <para>Connect the WAN cable to the uCPE device (see Figure 2). This
-          will be used as the uCPE management network interface, as described
-          below.</para>
-        </listitem>
-
-        <listitem>
-          <para>On the second page of the Web-installer, the user must do the
-          following:</para>
-
-          <itemizedlist>
-            <listitem>
-              <para>Configure the management network interface. This interface
-              is used by the Enea uCPE Manager to communicate with the uCPE
-              device.</para>
-            </listitem>
-
-            <listitem>
-              <para>Plug-in additional WAN interfaces (if applicable) and
-              provide their Layer 3 configuration.</para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
-      </orderedlist>
-
-      <para>When the user has completed the configuration steps in the
-      Web-installer, Enea NFV Access is installed on the hard drive. At this
-      stage, user should remove the USB stick and LAN cable and shutdown the
-      uCPE device. It will be started after necessary configurations are done
-      on the Enea uCPE Manager, as described below.</para>
-
-      <note>
-        <para>If the USB stick was booted in UEFI mode, an UEFI boot entry is
-        automatically created and the system will start booting from the hard
-        drive without further user configuration.</para>
-      </note>
-    </section>
-
-    <section id="prep_phys_exec">
-      <title>Preparing Physical Deployment for Execution</title>
-
-      <figure>
-        <title>Preparing for Deployment Execution</title>
-
-        <mediaobject>
-          <imageobject>
-            <imagedata contentwidth="600" fileref="images/prep_execution.png" />
-          </imageobject>
-        </mediaobject>
-      </figure>
-
-      <para>The following network configuration is needed for managing the
-      uCPE device and service deployment:</para>
-
-      <itemizedlist>
-        <listitem>
-          <para>Network connection between the server running the Enea uCPE
-          Manager and the laptop.</para>
-        </listitem>
-
-        <listitem>
-          <para>Network connection between the server running the Enea uCPE
-          Manager and the uCPE device.</para>
-        </listitem>
-      </itemizedlist>
-    </section>
-  </section>
-
-  <section id="mg_ucpe_devices">
-    <title>Management of uCPE Devices</title>
-
-    <para>When the installation is complete the uCPE device can be managed in
-    the Enea uCPE Manager.</para>
-
-    <section id="add_offline_config">
-      <title>Add a default Offline Configuration</title>
-
-      <para>Zero Touch Provisioning is always turned on when a uCPE device
-      connects to the Enea uCPE Manager. To enable it in the Enea uCPE
-      Manager, an offline configuration needs to be registered for Day-0
-      configuration.</para>
-
-      <note>
-        <para>Day-0 configuration is a software lifecycle term referring to
-        early configurations to put the uCPE device in an active state. Day-1
-        Configurations are applied after Day-0 and set the uCPE device and its
-        service in an active state. Day-2 Configurations are live
-        configurations on the uCPE and its service, applied after the uCPE
-        device and its service have been activated.</para>
-      </note>
-
-      <para>The offline configuration consists of data and parameters that are
-      meant to be automatically set when a uCPE device connects to the Enea
-      uCPE Manager for the first time. The configuration is typically focused
-      on setting up the network management of the uCPE device, e.g.
-      configuring network interfaces, WAN and LAN networking and service
-      chains.</para>
-
-      <para>For this base configuration, the offline configuration will be
-      left blank. The blank offline configuration can be filled with
-      user-specific values and data once the service is created, which is done
-      after installation is complete.</para>
-
-      <note>
-        <para>If the offline configuration is not configured, an alarm will be
-        raised: <literal>Day-0 Config:ZTP:Major</literal> when the uCPE device
-        tries to connect to Enea uCPE Manager, informing the user that the ZTP
-        setup failed for the uCPE device.</para>
-      </note>
-
-      <para><emphasis role="bold">To create an offline
-      configuration</emphasis> <orderedlist>
-          <listitem>
-            <para>In a browser access the Enea uCPE Manager, then
-            <literal>Applications</literal>-&gt;<literal>Offline
-            Config</literal>.</para>
-          </listitem>
-
-          <listitem>
-            <para>Create a new offline configuration in the GUI by clicking
-            <literal>Add</literal> and filling in the mandatory fields:
-            <literal>name</literal>, <literal>deviceVersion</literal> and
-            <literal>deviceId</literal>.</para>
-
-            <para>The name is user defined and can be set to any unique text
-            string identifying the configuration. The
-            <literal>deviceVersion</literal> must match the Enea NFV Access
-            version of the uCPE device and the <literal>deviceId</literal>
-            must be the previously set identifier of the uCPE device
-            (DeviceId).</para>
-          </listitem>
-        </orderedlist></para>
-    </section>
-
-    <section id="add_ucpe_mg">
-      <title>Add a uCPE device to the Management System</title>
-
-      <para>In order to enroll a uCPE device in the management system and
-      establish a management connection, the user will add uCPE device
-      information in the Enea uCPE Manager. This is accomplished by selecting
-      <literal>Devices</literal> -&gt; <literal>Manage</literal> -&gt;
-      <literal>Add</literal>.</para>
-
-      <para>The relevant parameters are:</para>
-
-      <itemizedlist>
-        <listitem>
-          <para><emphasis role="bold">Type.</emphasis> The type of device to
-          be added, i.e Enea universal CPE.</para>
-        </listitem>
-
-        <listitem>
-          <para><emphasis role="bold">Name.</emphasis> The name by which the
-          uCPE device is referred to in the Enea uCPE Manager.
-          (Mandatory).</para>
-        </listitem>
-
-        <listitem>
-          <para><emphasis role="bold">SSH Port.</emphasis> The NETCONF Port
-          used for communications. Default is set to 830.</para>
-        </listitem>
-
-        <listitem>
-          <para><emphasis role="bold">SSH User Name.</emphasis> The user name
-          for SSH connectivity. Default user is root.</para>
-        </listitem>
-
-        <listitem>
-          <para><emphasis role="bold">SSH Password.</emphasis> Leave this
-          blank.</para>
-        </listitem>
-
-        <listitem>
-          <para><emphasis role="bold">Device Calls Home.</emphasis> This
-          checkbox indicates the direction of uCPE device communications. For
-          a base configuration, leave this flag unchecked.</para>
-        </listitem>
-
-        <listitem>
-          <para><emphasis role="bold">Device ID.</emphasis> The unique
-          identifier of the uCPE device. (Mandatory).</para>
-        </listitem>
-      </itemizedlist>
-    </section>
-
-    <section id="boot_device_add_map">
-      <title>Booting the uCPE device and adding it to the Map</title>
-
-      <para>When connectivity is established with the Enea uCPE Manager and a
-      uCPE device is already registered with a matching <literal>Device
-      ID</literal>, the installation is complete, and the connection is
-      established.</para>
-
-      <para>When a uCPE device is registered it can be manually added to the
-      map for overview. Right-click on the map and select <literal>Place
-      Device</literal> to put the uCPE device on the map.</para>
-
-      <para>In case of management connection failure (e.g. due to a
-      misconfiguration), the uCPE device status will be seen as RED
-      (disconnected) in the Enea uCPE Manager. The uCPE device configuration
-      can be corrected by removing the WAN cable(s), reconnecting the laptop
-      to the LAN interface of the uCPE device and rebooting it. At this point,
-      the Web-installer can be accessed from the laptop as described in <olink
-      targetdoc="book_enea_nfv_access_getting_started"
-      targetptr="install_ena_device">Installing Enea NFV Access - uCPE Device
-      installation in the <xi:include
-      href="../../s_docbuild/olinkdb/pardoc-names.xml"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
-      Manual.</para>
-    </section>
-  </section>
-
-  <section id="ucpe_monitor">
-    <title>uCPE Device Monitorization and Control</title>
-
-    <para>Once the uCPE device is connected to the Enea uCPE Manager, it is
-    ready for central management. Two important functions available in the
-    Enea uCPE Manager GUI are alarm checking and resource allocation.</para>
-
-    <section id="check_alarms">
-      <title>Checking Alarms</title>
-
-      <para>The Enea uCPE Manager dashboard presents alarms in a specific
-      window on the front page.</para>
-
-      <para>An alarm can be easily triggered by disconnecting and reconnecting
-      the WAN ethernet cable from the uCPE device. The management system will
-      detect the broken link and raise an alarm: <literal>Device
-      Disconnected::Critical</literal>.</para>
-
-      <para>A separate Alarm Management window can be accessed from the Enea
-      uCPE Manager menu for in-depth access and programming of Alarms and
-      Events.</para>
-    </section>
-
-    <section id="ck_resource_alloc">
-      <title>Checking uCPE device Resource Allocation</title>
-
-      <para>When the uCPE device is connected to the Enea uCPE Manager it is
-      of interest to check the amount of hardware resources in use.</para>
-
-      <para>To check CPU, RAM and disk utilization simply select the uCPE
-      device and click the <literal>Virtual Machines</literal> tab in the map
-      view. The same view will show active VNFs running on the uCPE device
-      once instantiated.</para>
-    </section>
-
-    <section id="access_device_cli">
-      <title>Accessing the uCPE device CLI</title>
-
-      <para>As a final check to make sure the uCPE device was installed and
-      configured correctly, access the uCPE device Linux CLI by selecting the
-      uCPE device on the map and using the SSH button from the panel. A new
-      window will appear for CLI access. The default user and password are
-      <literal>root</literal> and blank, respectively.</para>
-
-      <para>The Enea NFV Access CLI is a pure Linux CLI providing access to
-      standard Linux CLI commands. The CLI is a central feature for running
-      custom scripting.</para>
-
-      <note>
-        <para>In case the uCPE was installed behind a NAT device, reverse SSH
-        connection will be used. For more details, please see <olink
-        targetdoc="book_enea_nfv_access_getting_started"
-        targetptr="device_callhome_nat">Device Call Home Connection for
-        deployment behind NAT in the <xi:include
-        href="../../s_docbuild/olinkdb/pardoc-names.xml"
-        xmlns:xi="http://www.w3.org/2001/XInclude"
-        xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
-        Manual.</para>
-      </note>
-    </section>
-  </section>
-</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-platform-open-source/doc/about.xml b/doc/book-enea-nfv-access-platform-open-source/doc/about.xml
deleted file mode 100644
index 377562c..0000000
--- a/doc/book-enea-nfv-access-platform-open-source/doc/about.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<chapter id="platform-open-source-packages-and-licenses">
-  <title>About this Report</title>
-
-  <para>This document contains the open source and license information pertaining to packages provided with this release of the Enea NFV Access Runtime Platform and the Installer.</para>
-</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-platform-open-source/swcomp.mk b/doc/book-enea-nfv-access-platform-open-source/swcomp.mk
deleted file mode 100644
index fc62acc..0000000
--- a/doc/book-enea-nfv-access-platform-open-source/swcomp.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# Component build specification
-
-# Version of THIS book
-BOOK_VER ?= $(REL_VER)-dev
-
-DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
-
-BOOKPACKAGES := book-enea-nfv-access-platform-open-source
-BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access Runtime Platform Open Source Report"
-BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-release-info/doc/known_bugs_and_limitations.xml b/doc/book-enea-nfv-access-release-info/doc/known_bugs_and_limitations.xml
deleted file mode 100644
index e4c9764..0000000
--- a/doc/book-enea-nfv-access-release-info/doc/known_bugs_and_limitations.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<chapter id="bugs-limitations">
-  <title>Known Issues and Limitations in this Release</title>
-
-  <para>This chapter lists the known general issues and limitations that
-  affect the current release.</para>
-
-  <itemizedlist>
-    <listitem>
-      <para><remark>LXCR-9904</remark>Enea NFV Access cannot be installed on
-      USB storage devices.</para>
-    </listitem>
-
-    <listitem>
-      <para><remark>LXCR-9799</remark>Proper boot order is not ensured if a
-      uCPE device has more than one HDD attached.</para>
-    </listitem>
-
-    <listitem>
-      <para><remark>ELCCR-527</remark>Cancelling a file upload in the Enea
-      uCPE Manager will require the user to close and reopen the upload window
-      for the next upload to work.</para>
-    </listitem>
-
-    <listitem>
-      <para><remark>ELCCR-577</remark>If a uCPEM is restored from a backup
-      made on a release version older than 2.2.3, VNFs cannot be instantiated
-      from the GUI.</para>
-    </listitem>
-
-    <listitem>
-      <para><remark>ELCCR-474</remark>Deleting VNF instances with flows
-      configured on the OVS bridges can be done only after removing the
-      flows.</para>
-    </listitem>
-
-    <listitem>
-      <para><remark>ELCCR-572</remark>Sometimes when selecting and deleting
-      more than one VNF instance simultaneously, an error message might be
-      triggered, even if the delete operation succeeds.</para>
-    </listitem>
-
-    <listitem>
-      <para><remark>ELCCR-847</remark>The Juniper vSRX VNF cannot be
-      instantiated on the Xeon-D architectures due to missing CPU features in
-      the VNF's domain XML. This impacts all example use cases and AF&amp;TH
-      tests where the Juniper VNF is used.</para>
-    </listitem>
-
-    <listitem>
-      <para><remark>LXCR-9853</remark>The WAN interface of a uCPE device needs
-      to be connected to a network with at least a router/gateway installed
-      for next-hop communication.</para>
-    </listitem>
-
-    <listitem>
-      <para><remark>LXCR-9992</remark>Depending on hardware capabilities,
-      there are certain limitations regarding the <literal>vfio-pci</literal>
-      and <literal>igb_uio</literal> drivers. While the Enea NFV Access Run
-      Time Platform uses the <literal>vfio-pci</literal> driver by default,
-      for certain hardware configurations, <literal>igb_uio</literal> should
-      be used instead, by providing custom scripting. Please contact Enea for
-      further details.</para>
-    </listitem>
-
-    <listitem>
-      <para><remark>STCR-6224</remark>The Automation Framework and Test
-      Harness do not support multiple custom scripts uploaded to the device at
-      the same time.</para>
-    </listitem>
-
-    <listitem>
-      <para><remark>STCR-6292</remark>Management of WAN Interfaces is not
-      implemented in the Automation Framework and Test Harness.</para>
-    </listitem>
-
-    <listitem>
-      <para><remark>ELCCR-912</remark>Adding an upgrade image into the Enea
-      uCPE Manager (<literal>Device &gt; Upgrade &gt; Add</literal>) fails,
-      producing the following error <literal>ostree: symbol lookup error:
-      /usr/local/lib/libostree-1.so.1: undefined symbol:
-      g_utf8_make_valid</literal>. This occurs when the Enea uCPE Manager is
-      installed on CentOS 7 prior to C7.1804 (kernel version &lt; 3.10.0-862).
-      As a workaround, update glib2 to version 2.54.2 or later, using
-      <command>#yum update glib2</command>.</para>
-    </listitem>
-
-    <listitem>
-      <para><remark>ELCCR-854</remark>Changing the management interface IP
-      address would result in a loss of connection with the device. If the
-      device is behind a NAT, while using Call Home connection, the connection
-      will not be reestablished until the old Call Home connection will cease
-      to exist. The exact amount of waiting time is determined by configurable
-      kernel parameters on the uCPE device, with the default waiting time of
-      more than 15 minutes. Restarting the vCPE Overlay will immediately
-      reestablish the connection, but that implies the existence of an
-      alternate way to trigger the vCPE restart operation on the
-      device.</para>
-    </listitem>
-
-    <listitem condition="hidden">
-      <para><emphasis role="bold">PDF navigation</emphasis>: When using links
-      to open other PDFs, or jump to another place in the same PDF, jumping
-      back sometimes fails. This has been observed when opening a PDF in Adobe
-      Reader, inside a browser with PDF add-on, as well as when the browser is
-      configured to open PDF files in an external PDF reader. As a workaround,
-      open the HTML version of the document.<remark>LXCR-3283</remark></para>
-    </listitem>
-  </itemizedlist>
-
-  <!-- The file with a section below is autocreated by make init  -->
-
-  <!-- <xi:include href="jiraissues_generated.xml"
-              xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
-</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-release-info/doc/main_changes.xml b/doc/book-enea-nfv-access-release-info/doc/main_changes.xml
deleted file mode 100644
index 625f163..0000000
--- a/doc/book-enea-nfv-access-release-info/doc/main_changes.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<chapter id="relinfo-changes">
-  <title>Main Changes</title>
-
-  <para>Below you'll find information about the new features and updates made
-  in this release, as well as details on the provided packages and the
-  backwards compatibility with previous versions of Enea NFV Access if
-  applicable.</para>
-
-  <section id="relinfo-changes-other">
-    <title>New Features and Improvements</title>
-
-    <para><emphasis role="bold">New Features:</emphasis></para>
-
-    <itemizedlist>
-      <listitem>
-        <para><remark>CPDX-3385</remark>Support for managing multiple devices
-        behind a NAT. This includes improvements to the call-home feature and
-        the use of reverse SSH when creating an SSH session for a device
-        connected via call-home.</para>
-      </listitem>
-
-      <listitem>
-        <para><remark>CPDX-3314</remark>Enhanced support for handling multiple
-        WAN ports.</para>
-      </listitem>
-
-      <listitem>
-        <para><remark>CPDX-3476</remark>Support for collecting uCPE device
-        logs and state information for use in troubleshooting.</para>
-      </listitem>
-    </itemizedlist>
-
-    <para><emphasis role="bold">Improvements:</emphasis></para>
-
-    <itemizedlist>
-      <listitem>
-        <para>Refactoring of the Enea NFV Access Getting Started
-        Manual.</para>
-      </listitem>
-
-      <listitem>
-        <para>Support for installing Enea NFV Access on eMMC disks.</para>
-      </listitem>
-
-      <listitem>
-        <para>Support for installing Enea NFV Access on disks larger than
-        1TB.</para>
-      </listitem>
-
-      <listitem>
-        <para>Improved boot time of Enea NFV Access by removing unnecessary or
-        redundant services.</para>
-      </listitem>
-
-      <listitem>
-        <para>Fixed the Enea NFV Access bare metal installation on Dell
-        VEP1445.</para>
-
-        <remark>More information might be needed here.</remark>
-      </listitem>
-
-      <listitem>
-        <para>Improved Installer Web-UI experience.</para>
-      </listitem>
-
-      <listitem>
-        <para><remark>ELCCR-354</remark>Improved Enea uCPE Manager instance
-        recovery from a faulty state, through the System Backup
-        functionality.</para>
-      </listitem>
-    </itemizedlist>
-
-    <para><emphasis role="bold">Early Access Features:</emphasis></para>
-
-    <para>The following Early Access features are included in this
-    release:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>Platform and VNF Snapshots:</para>
-
-        <itemizedlist>
-          <listitem>
-            <para>Platform Snapshots allow users to store, manage and restore
-            snapshots of the Enea NFV Access Runtime Platform configuration,
-            with the purpose of recovering after a failed reconfiguration.
-            This feature is disabled by default.</para>
-          </listitem>
-
-          <listitem>
-            <para>VNF Snapshots allow users to store, manage and restore
-            snapshots of VNFs deployed on the Enea NFV Access Runtime
-            Platform, with the purpose of restoring the VNF after a persistent
-            VNF failure. This feature is disabled by default.</para>
-          </listitem>
-        </itemizedlist>
-
-        <note>
-          <para>Users that would like to try out the Snapshot features should
-          contact Enea Support for additional documentation and
-          assistance.</para>
-        </note>
-      </listitem>
-
-      <listitem>
-        <para>Automation Framework - Early Access, is a redesigned automation
-        framework that will replace the existing AF&amp;TH in the next major
-        release. The new automation framework has improved usability and an
-        extended automation feature set. It has to be downloaded separately as
-        it is not part of the standard Enea NFV Access 2.3 distribution. The
-        Automation Framework - Early Access distribution also includes updated
-        user documentation.</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>Early Access features are provided for evaluation and early
-    feedback. They are not allowed to be used for business-critical
-    deployment, unless previously approved by Enea. Support cases reported on
-    Early Access features may only be set to a Minor Priority, with the intent
-    of addressing them in upcoming GA releases.</para>
-  </section>
-
-  <section id="open_source">
-    <title>Open Source</title>
-
-    <para>For more information about the Open Source packages included, please
-    refer to the Enea NFV Access Open Source Reports provided with this
-    release:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
-        xmlns:xi="http://www.w3.org/2001/XInclude"
-        xpointer="element(book_enea_nfv_access_platform_open_source/1)" />.
-        Contains open source and license information pertaining to packages
-        provided with the Enea NFV Access Runtime Platform.</para>
-      </listitem>
-
-      <listitem>
-        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
-        xmlns:xi="http://www.w3.org/2001/XInclude"
-        xpointer="element(book_enea_nfv_access_ucpem_open_source/1)" />.
-        Provides license information pertaining to packages available with the
-        Enea uCPE Manager.</para>
-      </listitem>
-
-      <listitem>
-        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
-        xmlns:xi="http://www.w3.org/2001/XInclude"
-        xpointer="element(book_enea_nfv_access_auto_fw_th_open_source/1)" />.
-        Provides license information pertaining to packages available with the
-        AF-TH.</para>
-      </listitem>
-    </itemizedlist>
-  </section>
-
-  <section id="relinfo-backward-compat">
-    <title>Compatibility</title>
-
-    <para>This release does not contain any change impacting
-    compatibility.</para>
-  </section>
-</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-system-test-specification/swcomp.mk b/doc/book-enea-nfv-access-system-test-specification/swcomp.mk
deleted file mode 100755
index aea86ca..0000000
--- a/doc/book-enea-nfv-access-system-test-specification/swcomp.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# Component build specification
-
-# Version of THIS book
-BOOK_VER ?= $(REL_VER)-dev
-
-DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
-
-BOOKPACKAGES := book-enea-nfv-access-system-test-specification
-BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access $(PROD_VER) System Test Specification"
-BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/docsrc_common/pardoc-distro.xml b/doc/docsrc_common/pardoc-distro.xml
index fce0543..b6bc8bb 100644
--- a/doc/docsrc_common/pardoc-distro.xml
+++ b/doc/docsrc_common/pardoc-distro.xml
@@ -1,31 +1,57 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
 <!-- Declarations to inherit by xi:include
 ========================================== -->
 <section id="pardoc_names">
-  <title>Enea NFV Access DocBook XML Based UserDoc Names and Parameters</title>
+  <title>Enea NFV Access DocBook XML Based UserDoc Names and
+  Parameters</title>
 
-  <para>NOTE: DO NOT EDIT THIS FILE IN xmlmind but you can open it to see any errors, don't save!!!!</para>
+  <para>NOTE: DO NOT EDIT THIS FILE IN xmlmind but you can open it to see any
+  errors, don't save!!!</para>
 
   <para>NOTE: Use xi:include to include parameters into a docbook XML file.
-        Note: Only full elements can be included and the included element must
-        be allowed in that place. Example: For ulink, entire ulink elements
-        must be included, not just parts of them.</para>
+  Note: Only full elements can be included and the included element must be
+  allowed in that place. Example: For ulink, entire ulink elements must be
+  included, not just parts of them.</para>
 
   <para>**** The phrase elements below can be used as variables in several
-             places in XML files and/or in make script files ****</para>
+  places in XML files and/or in make script files ****</para>
+
+  <!-- Distribution and release -->
 
-<!-- Distribution and release -->
-<!--
+  <!--
     The parameter 'prev_baseline' is intentionally undefined here since this
     is the first release of the networking profile. The line must be removed.
 -->
-<para id="prev_lic_file"><phrase>doc/book-enea-nfv-access-open-source/doc/licenses.xml</phrase></para>
-<para id="new_lic_file"><phrase>doc/book-enea-nfv-access-open-source/doc/licenses.xml</phrase></para>
-<para id="prev_lic_file"><phrase>doc/book-enea-nfv-access-openstack-open-source/doc/licenses.xml</phrase></para>
-<para id="new_lic_file"><phrase>book-enea-nfv-access-openstack-open-source/doc/licenses.xml</phrase></para>
-<para id="prev_lic_file"><phrase>doc/book-enea-nfv-access-dev-open-source/doc/licenses.xml</phrase></para>
-<para id="new_lic_file"><phrase>doc/book-enea-nfv-access-dev-open-source/doc/licenses.xml</phrase></para>
-</section>
+
+  <para
+  id="prev_lic_file"><phrase>doc/book_enea_edge_runtime_open_source/doc/licenses.xml</phrase></para>
+
+  <para
+  id="new_lic_file"><phrase>doc/book_enea_edge_runtime_open_source/doc/licenses.xml</phrase></para>
+
+  <para
+  id="prev_lic_file"><phrase>doc/book_enea_edge_management_open_source/doc/licenses.xml</phrase></para>
+
+  <para
+  id="new_lic_file"><phrase>doc/book_enea_edge_management_open_source/doc/licenses.xml</phrase></para>
+
+  <para
+  id="prev_lic_file"><phrase>doc/book_enea_edge_telemetry_open_source/licenses.xml</phrase></para>
+
+  <para
+  id="new_lic_file"><phrase>doc/book_enea_edge_telemetry_open_source/doc/licenses.xml</phrase></para>
+
+  <para
+  id="prev_lic_file"><phrase>doc/book_enea_edge_automation_open_source/licenses.xml</phrase></para>
+
+  <para
+  id="new_lic_file"><phrase>doc/book_enea_edge_automation_open_source/doc/licenses.xml</phrase></para>
+
+  <para
+  id="prev_lic_file"><phrase>doc/book_enea_edge_auto_fw_th_open_source/licenses.xml</phrase></para>
+
+  <para
+  id="new_lic_file"><phrase>doc/book_enea_edge_auto_fw_th_open_source/doc/licenses.xml</phrase></para>
+</section>
\ No newline at end of file