diff --git a/extras/deploy-scripts/pandora_deploy_community.sh b/extras/deploy-scripts/pandora_deploy_community.sh
index 87e4bb4b35..a0f08822e1 100644
--- a/extras/deploy-scripts/pandora_deploy_community.sh
+++ b/extras/deploy-scripts/pandora_deploy_community.sh
@@ -256,6 +256,8 @@ console_dependencies=" \
     poppler-data \
     php-yaml \
     mod_ssl \
+    libzstd \
+    openldap-clients \
     http://firefly.artica.es/centos8/phantomjs-2.1.1-1.el7.x86_64.rpm"
 execute_cmd "yum install -y $console_dependencies" "Installing Pandora FMS Console dependencies"
 
diff --git a/extras/deploy-scripts/pandora_deploy_community_el8.sh b/extras/deploy-scripts/pandora_deploy_community_el8.sh
index c8c7561ffc..5b549a2933 100644
--- a/extras/deploy-scripts/pandora_deploy_community_el8.sh
+++ b/extras/deploy-scripts/pandora_deploy_community_el8.sh
@@ -307,6 +307,8 @@ console_dependencies=" \
     poppler-data \
     php-yaml \
     mod_ssl \
+    libzstd \
+    openldap-clients \
     http://firefly.artica.es/centos8/perl-Net-Telnet-3.04-1.el8.noarch.rpm \
     http://firefly.artica.es/centos7/wmic-1.4-1.el7.x86_64.rpm \
     http://firefly.artica.es/centos8/phantomjs-2.1.1-1.el7.x86_64.rpm"
diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 77758e69fe..7aa0b1dc23 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.762-220613
+Version: 7.0NG.762-220616
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index f0a5d37893..da2264d92c 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.762-220613"
+pandora_version="7.0NG.762-220616"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 67a52c8cbe..746683baf2 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1015,7 +1015,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.762';
-use constant AGENT_BUILD => '220613';
+use constant AGENT_BUILD => '220616';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 6e19bc9abc..d64f371dcd 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.762
-%define release     220613
+%define release     220616
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index f6c87cb14c..9bfcd6774f 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.762
-%define release     220613
+%define release     220616
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index e1f22051f6..e32d36a978 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.762"
-PI_BUILD="220613"
+PI_BUILD="220616"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 567e8751c9..b50d0d622d 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{220613}
+{220616}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 28d4f93091..06b91d8b58 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.762 Build 220613")
+#define PANDORA_VERSION ("7.0NG.762 Build 220616")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index c7990e794e..0610000718 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.762(Build 220613))"
+      VALUE "ProductVersion", "(7.0NG.762(Build 220616))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index df0a3dc5c1..9bc4338c1f 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.762-220613
+Version: 7.0NG.762-220616
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index 9f71fde1d6..57af185b00 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.762-220613"
+pandora_version="7.0NG.762-220616"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/extras/delete_files/delete_files.txt b/pandora_console/extras/delete_files/delete_files.txt
index fe13fd3149..73284cb169 100644
--- a/pandora_console/extras/delete_files/delete_files.txt
+++ b/pandora_console/extras/delete_files/delete_files.txt
@@ -1665,3 +1665,4 @@ godmode/um_client/vendor/sebastian/object-enumerator/tests
 godmode/um_client/vendor/sebastian/object-enumerator
 godmode/um_client/vendor/sebastian
 godmode/um_client/vendor
+/update_manager_client/resources/styles/pandora.css
\ No newline at end of file
diff --git a/pandora_console/extras/mr/55.sql b/pandora_console/extras/mr/55.sql
index 4542d76b80..b9c87d8af7 100644
--- a/pandora_console/extras/mr/55.sql
+++ b/pandora_console/extras/mr/55.sql
@@ -1,7 +1,41 @@
 START TRANSACTION;
 
-ALTER TABLE `tservice` ADD COLUMN `enable_sunburst` tinyint(1) NOT NULL default 0;
+ALTER TABLE `tuser_double_auth` DROP FOREIGN KEY `tuser_double_auth_ibfk_1`, MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL;
+ALTER TABLE `tnotification_user` DROP FOREIGN KEY `tnotification_user_ibfk_2`, MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL;
+ALTER TABLE `tnotification_source_user` DROP FOREIGN KEY `tnotification_source_user_ibfk_2`, MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL;
+ALTER TABLE `tnotification_source_group_user` DROP FOREIGN KEY `tnotification_source_group_user_ibfk_2`, MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL;
+ALTER TABLE `tvisual_console_elements_cache` DROP FOREIGN KEY `tvisual_console_elements_cache_ibfk_3`, MODIFY COLUMN `user_id` VARCHAR(255) DEFAULT NULL;
+ALTER TABLE `tusuario` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT '0';
+ALTER TABLE `tuser_double_auth` ADD CONSTRAINT `tuser_double_auth_ibfk_1` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE;
+ALTER TABLE `tnotification_user` ADD CONSTRAINT `tnotification_user_ibfk_2` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `tnotification_source_user` ADD CONSTRAINT `tnotification_source_user_ibfk_2` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `tnotification_source_group_user` ADD CONSTRAINT `tnotification_source_group_user_ibfk_2` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `tvisual_console_elements_cache` ADD CONSTRAINT `tvisual_console_elements_cache_ibfk_3` FOREIGN KEY (`user_id`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `tattachment` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '';
+ALTER TABLE `tevento` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0';
+ALTER TABLE `tincidencia` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '';
+ALTER TABLE `tnota` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0';
+ALTER TABLE `tsesion` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0';
+ALTER TABLE `ttrap` MODIFY COLUMN `id_usuario` VARCHAR(255) DEFAULT '';
+ALTER TABLE `tusuario_perfil` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '';
+ALTER TABLE `treset_pass_history` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL;
+ALTER TABLE `tmensajes` MODIFY COLUMN `id_usuario_origen` VARCHAR(255) NOT NULL DEFAULT '';
+ALTER TABLE `tgraph` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT '';
+ALTER TABLE `treport` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT '';
+ALTER TABLE `tplanned_downtime` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT '0';
+ALTER TABLE `tnetwork_map` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL;
+ALTER TABLE `tpassword_history` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL;
+ALTER TABLE `tupdate_journal` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT '';
+ALTER TABLE `tmap` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT '';
+ALTER TABLE `tdashboard` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT '';
+ALTER TABLE `treport_template` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT '';
+ALTER TABLE `tmetaconsole_event` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0';
+ALTER TABLE `tmetaconsole_event_history` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0';
+ALTER TABLE `treset_pass` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT '';
+ALTER TABLE `tuser_task_scheduled` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0';
+ALTER TABLE `tbackup` MODIFY COLUMN `id_user` VARCHAR(255) DEFAULT '';
 
+ALTER TABLE `tservice` ADD COLUMN `enable_sunburst` tinyint(1) NOT NULL default 0;
 ALTER TABLE `tdashboard` MODIFY `name` TEXT NOT NULL DEFAULT '';
 
 ALTER TABLE `tevent_alert` ADD COLUMN `field1_recovery` text DEFAULT '' AFTER `recovery_notify`;
@@ -13,4 +47,14 @@ ALTER TABLE `tevent_alert` ADD COLUMN `field8_recovery` text DEFAULT '' AFTER `f
 ALTER TABLE `tevent_alert` ADD COLUMN `field0_recovery` text DEFAULT '' AFTER `field8_recovery`;
 ALTER TABLE `tevent_alert` ADD COLUMN `field10_recovery` text DEFAULT '' AFTER `field9_recovery`;
 
+SET @st_oum763 = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name = 'tautoconfig' AND table_schema = DATABASE() AND column_name = 'disabled') > 0,
+    "SELECT 1",
+    "ALTER TABLE `tautoconfig` ADD COLUMN `disabled` TINYINT DEFAULT 0"
+));
+
+PREPARE pr_oum763 FROM @st_oum763;
+EXECUTE pr_oum763;
+DEALLOCATE PREPARE pr_oum763;
+
 COMMIT;
diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php
index f0b75c51a5..590dbe328a 100644
--- a/pandora_console/general/main_menu.php
+++ b/pandora_console/general/main_menu.php
@@ -26,6 +26,8 @@
  * ============================================================================
  */
 
+use function PHPSTORM_META\map;
+
 // Begin.
 if (isset($config['id_user']) === false) {
     include 'general/login_page.php';
@@ -57,52 +59,22 @@ if (isset($config['autohidden_menu']) === true && (bool) $config['autohidden_men
 // Start of full lateral menu.
 echo sprintf('<div id="menu_full" class="menu_full_%s">', $menuTypeClass);
 
-$custom_logo = 'images/custom_logo/'.$config['custom_logo'];
-$custom_logo_collapsed = 'images/custom_logo/'.$config['custom_logo_collapsed'];
-
-if (defined('PANDORA_ENTERPRISE') === false) {
-    $logo_title = get_product_name().' Opensource';
-    $custom_logo = 'images/custom_logo/pandora_logo_head_3.png';
-    $custom_logo_collapsed = 'images/custom_logo/pandora_logo_green_collapsed.png';
-} else {
-    if (file_exists(ENTERPRISE_DIR.'/'.$custom_logo) === true) {
-        $custom_logo = ENTERPRISE_DIR.'/'.$custom_logo;
-    }
-
-    $logo_title = get_product_name().' Enterprise';
-}
-
-echo '<div class="logo_green"><a href="index.php?sec=main">';
-
-if (isset($config['custom_logo']) === true) {
-    echo html_print_image(
-        $custom_logo,
-        true,
-        [
-            'border' => '0',
-            'width'  => '215',
-            'alt'    => $logo_title,
-            'class'  => 'logo_full',
-            'style'  => ($menuCollapsed === true) ? 'display:none' : 'display:block',
-        ]
-    );
-}
-
-if (isset($config['custom_logo_collapsed']) === true) {
-    echo html_print_image(
-        $custom_logo_collapsed,
-        true,
-        [
-            'border' => '0',
-            'width'  => '60',
-            'alt'    => $logo_title,
-            'class'  => 'logo_icon',
-            'style'  => ($menuCollapsed === true) ? 'display:block' : 'display:none',
-        ]
-    );
-}
-
-echo '</a></div>';
+// Header logo.
+html_print_div(
+    [
+        'class'   => 'logo_green',
+        'content' => html_print_anchor(
+            [
+                'href'    => ui_get_full_url('index.php'),
+                'content' => html_print_header_logo_image(
+                    $menuCollapsed,
+                    true
+                ),
+            ],
+            true
+        ),
+    ]
+);
 
 require 'operation/menu.php';
 require 'godmode/menu.php';
diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index aeecc25273..bb43ad0df5 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -525,21 +525,21 @@ $menu_godmode['links']['sub'] = $sub;
 
 // Update Manager
 if (check_acl($config['id_user'], 0, 'PM') && $config['enable_update_manager']) {
-    $menu_godmode['messages']['text'] = __('Update manager');
+    $menu_godmode['messages']['text'] = __('Warp Update');
     $menu_godmode['messages']['id'] = 'god-um_messages';
     $menu_godmode['messages']['sec2'] = '';
 
     $sub = [];
-    $sub['godmode/update_manager/update_manager&tab=offline']['text'] = __('Update Manager offline');
+    $sub['godmode/update_manager/update_manager&tab=offline']['text'] = __('Update offline');
     $sub['godmode/update_manager/update_manager&tab=offline']['id'] = 'Offline';
 
-    $sub['godmode/update_manager/update_manager&tab=online']['text'] = __('Update Manager online');
+    $sub['godmode/update_manager/update_manager&tab=online']['text'] = __('Update online');
     $sub['godmode/update_manager/update_manager&tab=online']['id'] = 'Online';
 
-    $sub['godmode/update_manager/update_manager&tab=setup']['text'] = __('Update Manager options');
+    $sub['godmode/update_manager/update_manager&tab=setup']['text'] = __('Options');
     $sub['godmode/update_manager/update_manager&tab=setup']['id'] = 'Options';
 
-    $sub['godmode/update_manager/update_manager&tab=history']['text'] = __('Update Manager journal');
+    $sub['godmode/update_manager/update_manager&tab=history']['text'] = __('Warp journal');
     $sub['godmode/update_manager/update_manager&tab=history']['id'] = 'Journal';
 
     $menu_godmode['messages']['sub'] = $sub;
diff --git a/pandora_console/godmode/um_client/index.php b/pandora_console/godmode/um_client/index.php
index ebd13796c6..e74045b570 100644
--- a/pandora_console/godmode/um_client/index.php
+++ b/pandora_console/godmode/um_client/index.php
@@ -313,7 +313,7 @@ if (is_array($config) === true) {
         if ($mode === Manager::MODE_ONLINE
             && ($puid === null || $puid === 'OFFLINE')
         ) {
-            ui_print_error_message(__('Update manager online requires registration.'));
+            ui_print_error_message(__('Update online requires registration.'));
         }
 
         if ($mode === Manager::MODE_OFFLINE) {
diff --git a/pandora_console/godmode/update_manager/update_manager.php b/pandora_console/godmode/update_manager/update_manager.php
index da9eb8543d..0c9b8c6087 100644
--- a/pandora_console/godmode/update_manager/update_manager.php
+++ b/pandora_console/godmode/update_manager/update_manager.php
@@ -1,21 +1,36 @@
 <?php
+/**
+ * Update manager.
+ *
+ * @category   Update Manager
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2022 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
 
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; version 2
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
+// Begin.
 global $config;
 
 check_login();
-// The ajax is in
-// include/ajax/update_manager.php
+// The ajax is in include/ajax/update_manager.php.
 if (! check_acl($config['id_user'], 0, 'PM') && ! is_user_admin($config['id_user'])) {
     db_pandora_audit(
         AUDIT_LOG_ACL_VIOLATION,
@@ -36,59 +51,65 @@ if ($php_version_array[0] < 7) {
 $tab = get_parameter('tab', 'online');
 
 $buttons['setup'] = [
-    'active' => ($tab == 'setup') ? true : false,
+    'active' => ($tab === 'setup') ? true : false,
     'text'   => '<a href="'.ui_get_full_url(
         'index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=setup'
-    ).'">'.html_print_image('images/gm_setup.png', true, ['title' => __('Options'), 'class' => 'invert_filter']).'</a>',
+    ).'">'.html_print_image('images/gm_setup.png', true, ['title' => __('Setup'), 'class' => 'invert_filter']).'</a>',
 ];
 
 $buttons['history'] = [
-    'active' => ($tab == 'history') ? true : false,
+    'active' => ($tab === 'history') ? true : false,
     'text'   => '<a href="'.ui_get_full_url(
         'index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=histo'
     ).'ry">'.html_print_image('images/gm_db.png', true, ['title' => __('Journal'), 'class' => 'invert_filter']).'</a>',
 ];
 
 $buttons['offline'] = [
-    'active' => ($tab == 'offline') ? true : false,
+    'active' => ($tab === 'offline') ? true : false,
     'text'   => '<a href="'.ui_get_full_url(
         'index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=offli'
-    ).'ne">'.html_print_image('images/box.png', true, ['title' => __('Offline update manager'), 'class' => 'invert_filter']).'</a>',
+    ).'ne">'.html_print_image('images/box.png', true, ['title' => __('Offline update'), 'class' => 'invert_filter']).'</a>',
 ];
 
 $buttons['online'] = [
-    'active' => ($tab == 'online') ? true : false,
+    'active' => ($tab === 'online') ? true : false,
     'text'   => '<a href="'.ui_get_full_url(
         'index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=onlin'
-    ).'e">'.html_print_image('images/op_gis.png', true, ['title' => __('Online update manager'), 'class' => 'invert_filter']).'</a>',
+    ).'e">'.html_print_image('images/op_gis.png', true, ['title' => __('Online update'), 'class' => 'invert_filter']).'</a>',
 ];
 
 switch ($tab) {
     case 'history':
-        $title = __('Update manager » Journal');
+        $title = __('Journal');
     break;
 
     case 'setup':
-        $title = __('Update manager » Setup');
+        $title = __('Setup');
     break;
 
     case 'offline':
-        $title = __('Update manager » Offline');
+        $title = __('Offline');
     break;
 
     case 'online':
     default:
-        $title = __('Update manager » Online');
+        $title = __('Online');
     break;
 }
 
-ui_print_page_header(
+ui_print_standard_header(
     $title,
     'images/gm_setup.png',
     false,
     '',
     true,
-    $buttons
+    $buttons,
+    [
+        [
+            'link'  => '',
+            'label' => 'Warp Update',
+        ],
+    ]
 );
 
 switch ($tab) {
@@ -107,6 +128,39 @@ switch ($tab) {
 
     case 'online':
     default:
+        if (is_metaconsole() === false && has_metaconsole() === true) {
+            $meta_puid = null;
+
+            $server_id = $config['metaconsole_node_id'];
+            $dbh = (object) $config['dbconnection'];
+
+            // Connect to metaconsole.
+            $result_code = metaconsole_load_external_db(
+                [
+                    'dbhost' => $config['replication_dbhost'],
+                    'dbuser' => $config['replication_dbuser'],
+                    'dbpass' => io_output_password($config['replication_dbpass']),
+                    'dbname' => $config['replication_dbname'],
+                ]
+            );
+
+            if ($result_code < 0) {
+                break;
+            }
+
+            $value = db_get_value('value', 'tconfig', 'token', 'pandora_uid');
+
+            $meta_puid = $value;
+
+            // Return connection to node.
+            metaconsole_restore_db();
+
+            if ($meta_puid === false || $meta_puid === null) {
+                ui_print_warning_message(__('Please register on metaconsole first.'));
+                break;
+            }
+        }
+
         $mode = \UpdateManager\UI\Manager::MODE_ONLINE;
         include $config['homedir'].'/godmode/um_client/index.php';
     break;
diff --git a/pandora_console/godmode/update_manager/update_manager.setup.php b/pandora_console/godmode/update_manager/update_manager.setup.php
index e22c31031d..e3ca9f4958 100644
--- a/pandora_console/godmode/update_manager/update_manager.setup.php
+++ b/pandora_console/godmode/update_manager/update_manager.setup.php
@@ -268,17 +268,18 @@ $table->style[$i] = 'font-weight: bolder;width:250px';
 
 $url_update_manager = update_manager_get_url();
 
-$table->data[$i][0] = __('URL update manager:');
+$table->data[$i][0] = __('Warp Update URL');
 $table->data[$i++][1] = html_print_input_text(
     'url_update_manager',
     $url_update_manager,
     __('URL update manager'),
     80,
     255,
+    true,
     true
 );
 
-$table->data[$i][0] = __('Use secured update manager:');
+$table->data[$i][0] = __('Use secured Warp Update');
 $table->data[$i++][1] = html_print_input(
     [
         'type'  => 'switch',
@@ -287,7 +288,7 @@ $table->data[$i++][1] = html_print_input(
     ]
 );
 
-$table->data[$i][0] = __('Proxy server:');
+$table->data[$i][0] = __('Proxy server');
 $table->data[$i++][1] = html_print_input_text(
     'update_manager_proxy_server',
     $update_manager_proxy_server,
@@ -297,7 +298,7 @@ $table->data[$i++][1] = html_print_input_text(
     true
 );
 
-$table->data[$i][0] = __('Proxy port:');
+$table->data[$i][0] = __('Proxy port');
 $table->data[$i++][1] = html_print_input_text(
     'update_manager_proxy_port',
     $update_manager_proxy_port,
@@ -307,7 +308,7 @@ $table->data[$i++][1] = html_print_input_text(
     true
 );
 
-$table->data[$i][0] = __('Proxy user:');
+$table->data[$i][0] = __('Proxy user');
 $table->data[$i++][1] = html_print_input_text(
     'update_manager_proxy_user',
     $update_manager_proxy_user,
@@ -317,7 +318,7 @@ $table->data[$i++][1] = html_print_input_text(
     true
 );
 
-$table->data[$i][0] = __('Proxy password:');
+$table->data[$i][0] = __('Proxy password');
 $table->data[$i++][1] = html_print_input_password(
     'update_manager_proxy_password',
     $update_manager_proxy_password,
@@ -327,7 +328,7 @@ $table->data[$i++][1] = html_print_input_password(
     true
 );
 
-$table->data[$i][0] = __('Allow no-consecutive patches:');
+$table->data[$i][0] = __('Allow no-consecutive patches');
 $table->data[$i++][1] = html_print_switch(
     [
         'name'   => 'allow_offline_patches',
@@ -336,7 +337,7 @@ $table->data[$i++][1] = html_print_switch(
     ]
 );
 
-$table->data[$i][0] = __('Limit to LTS updates:');
+$table->data[$i][0] = __('Limit to LTS updates');
 $table->data[$i++][1] = html_print_switch(
     [
         'name'   => 'lts_updates',
@@ -346,11 +347,11 @@ $table->data[$i++][1] = html_print_switch(
 );
 
 
-$table->data[$i][0] = __('Registration ID:');
-$table->data[$i++][1] = '<i>'.$config['pandora_uid'].'</i>';
+$table->data[$i][0] = __('Registration ID');
+$table->data[$i++][1] = '<i>'.($config['pandora_uid'] ?? __('Not registred yet')).'</i>';
 
 if (update_manager_verify_registration() === true && users_is_admin()) {
-    $table->data[$i][0] = __('Cancel registration:');
+    $table->data[$i][0] = __('Cancel registration');
     $table->data[$i][1] = '<a href="';
     if ((bool) is_metaconsole() === true) {
         $table->data[$i][1] .= ui_get_full_url(
@@ -367,7 +368,7 @@ if (update_manager_verify_registration() === true && users_is_admin()) {
 
 if (license_free()) {
     $config['identification_reminder'] = isset($config['identification_reminder']) ? $config['identification_reminder'] : 1;
-    $table->data[$i][0] = __('Pandora FMS community reminder').ui_print_help_tip(__('Every 8 days, a message is displayed to admin users to remember to register this Pandora instance'), true);
+    $table->data[$i][0] = __('%s community reminder', get_product_name()).ui_print_help_tip(__('Every 8 days, a message is displayed to admin users to remember to register this %s instance', get_product_name()), true);
     $table->data[$i][1] = __('Yes').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button('identification_reminder', 1, '', $config['identification_reminder'], true).'&nbsp;&nbsp;';
     $table->data[$i++][1] .= __('No').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button('identification_reminder', 0, '', $config['identification_reminder'], true);
 }
diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index 669bdf4fdf..67a269bc66 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -860,7 +860,7 @@ if (!$new_user) {
         '',
         '',
         20,
-        100,
+        255,
         !$new_user || $view_mode,
         '',
         [
diff --git a/pandora_console/images/custom_logo/logo-black-pandorafms.png b/pandora_console/images/custom_logo/logo-black-pandorafms.png
new file mode 100644
index 0000000000..b1b909089e
Binary files /dev/null and b/pandora_console/images/custom_logo/logo-black-pandorafms.png differ
diff --git a/pandora_console/images/custom_logo/logo-default-pandorafms.png b/pandora_console/images/custom_logo/logo-default-pandorafms.png
new file mode 100644
index 0000000000..6a32836fd3
Binary files /dev/null and b/pandora_console/images/custom_logo/logo-default-pandorafms.png differ
diff --git a/pandora_console/images/custom_logo/logo-pandorafms-1-collapsed.png b/pandora_console/images/custom_logo/logo-pandorafms-1-collapsed.png
new file mode 100644
index 0000000000..494003c145
Binary files /dev/null and b/pandora_console/images/custom_logo/logo-pandorafms-1-collapsed.png differ
diff --git a/pandora_console/include/class/OrderInterpreter.class.php b/pandora_console/include/class/OrderInterpreter.class.php
index 25ecfdae64..f32c48b1d0 100644
--- a/pandora_console/include/class/OrderInterpreter.class.php
+++ b/pandora_console/include/class/OrderInterpreter.class.php
@@ -336,7 +336,7 @@ class OrderInterpreter extends Wizard
                 ),
             ],
             [
-                'name' => __('Update Manager'),
+                'name' => __('Warp Update'),
                 'icon' => ui_get_full_url(
                     'images/menu/um_messages.menu_gray.png'
                 ),
@@ -404,10 +404,10 @@ class OrderInterpreter extends Wizard
                         '.$value['name'].'</a><br>';
                     }
 
-                    $iterator ++;
+                    $iterator++;
 
                     if ($iterator > 10) {
-                        $more_results ++;
+                        $more_results++;
                     }
                 }
             }
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 21197bb7aa..9db7f38355 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -20,7 +20,7 @@
 /**
  * Pandora build version and version
  */
-$build_version = 'PC220613';
+$build_version = 'PC220616';
 $pandora_version = 'v7.0NG.762';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php
index e1d24ede9c..64be59b7aa 100644
--- a/pandora_console/include/constants.php
+++ b/pandora_console/include/constants.php
@@ -294,7 +294,11 @@ define('SERVICE_ELEMENT_DYNAMIC', 'dynamic');
 define('SERVICE_MODE_MANUAL', 0);
 define('SERVICE_MODE_SMART', 1);
 
-
+// New installation Product Logo.
+define('HEADER_LOGO_DEFAULT_CLASSIC', 'logo-default-pandorafms.png');
+define('HEADER_LOGO_DEFAULT_COLLAPSED', 'logo-default-pandorafms-collapsed.png');
+define('HEADER_LOGO_BLACK_CLASSIC', 'logo-black-pandorafms.png');
+define('HEADER_LOGO_BLACK_COLLAPSED', 'logo-default-pandorafms-collapsed.png');
 
 // Status images.
 // For modules.
@@ -802,7 +806,7 @@ define('AUDIT_LOG_SNMP_MANAGEMENT', 'SNMP management');
 define('AUDIT_LOG_DASHBOARD_MANAGEMENT', 'Dashboard management');
 define('AUDIT_LOG_SERVICE_MANAGEMENT', 'Service management');
 define('AUDIT_LOG_INCIDENT_MANAGEMENT', 'Incident management');
-define('AUDIT_LOG_UMC', 'Update Manager');
+define('AUDIT_LOG_UMC', 'Warp Manager');
 
 // MIMEs.
 define(
diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index a265c10c84..d2c4f11823 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -5116,7 +5116,7 @@ function api_set_update_snmp_module($id_module, $thrash1, $other, $thrash3)
 function api_set_new_network_component($id, $thrash1, $other, $thrash2)
 {
     global $config;
-    if (is_metaconsole() === true) {
+    if (defined('METACONSOLE')) {
         return;
     }
 
@@ -5218,7 +5218,7 @@ function api_set_new_plugin_component($id, $thrash1, $other, $thrash2)
 {
     global $config;
 
-    if (is_metaconsole() === true) {
+    if (defined('METACONSOLE')) {
         return;
     }
 
@@ -5498,7 +5498,7 @@ function api_set_new_local_component($id, $thrash1, $other, $thrash2)
 {
     global $config;
 
-    if (is_metaconsole() === true) {
+    if (defined('METACONSOLE')) {
         return;
     }
 
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 855bc67a7d..d754d225e2 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -1607,7 +1607,7 @@ function config_update_config()
                                 'port' => $config['history_db_port'],
                                 'name' => $config['history_db_name'],
                                 'user' => $config['history_db_user'],
-                                'pass' => $config['history_db_pass'],
+                                'pass' => io_output_password($config['history_db_pass']),
                             ]
                         );
 
@@ -1619,48 +1619,47 @@ function config_update_config()
                             $dbm->process();
                         } else if ($dbm->check() !== true) {
                             $errors[] = $dbm->getLastError();
+                            config_update_value('history_db_enabled', false);
+                        }
+
+                        if ($dbm->check() === true) {
+                            // Historical configuration tokens (stored in historical db).
+                            if ($dbm->setConfigToken(
+                                'days_purge',
+                                get_parameter('history_dbh_purge')
+                            ) !== true
+                            ) {
+                                $error_update[] = __('Historical database purge');
+                            }
+
+                            if ($dbm->setConfigToken(
+                                'history_partitions_auto',
+                                get_parameter_switch('history_partitions_auto', 0)
+                            ) !== true
+                            ) {
+                                $error_update[] = __('Historical database partitions');
+                            }
+
+                            if ($dbm->setConfigToken(
+                                'event_purge',
+                                get_parameter('history_dbh_events_purge')
+                            ) !== true
+                            ) {
+                                $error_update[] = __('Historical database events purge');
+                            }
+
+                            if ($dbm->setConfigToken(
+                                'string_purge',
+                                get_parameter('history_dbh_string_purge')
+                            ) !== true
+                            ) {
+                                $error_update[] = __('Historical database string purge');
+                            }
+
+                            // Disable history db in history db.
+                            $dbm->setConfigToken('history_db_enabled', 0);
                         }
                     }
-
-                    // Historical configuration tokens (stored in historical db).
-                    if (Config::set(
-                        'days_purge',
-                        get_parameter('history_dbh_purge'),
-                        true
-                    ) !== true
-                    ) {
-                        $error_update[] = __('Historical database purge');
-                    }
-
-                    if (Config::set(
-                        'history_partitions_auto',
-                        get_parameter_switch('history_partitions_auto', 0),
-                        true
-                    ) !== true
-                    ) {
-                        $error_update[] = __('Historical database partitions');
-                    }
-
-                    if (Config::set(
-                        'event_purge',
-                        get_parameter('history_dbh_events_purge'),
-                        true
-                    ) !== true
-                    ) {
-                        $error_update[] = __('Historical database events purge');
-                    }
-
-                    if (Config::set(
-                        'string_purge',
-                        get_parameter('history_dbh_string_purge'),
-                        true
-                    ) !== true
-                    ) {
-                        $error_update[] = __('Historical database string purge');
-                    }
-
-                    // Disable history db in history db.
-                    Config::set('history_db_enabled', 0, true);
                 break;
 
                 case 'ehorus':
@@ -2357,12 +2356,12 @@ function config_process_config()
         config_update_value('custom_favicon', '');
     }
 
-    if (!isset($config['custom_logo'])) {
-        config_update_value('custom_logo', 'pandora_logo_head_4.png');
+    if (isset($config['custom_logo']) === false) {
+        config_update_value('custom_logo', HEADER_LOGO_DEFAULT_CLASSIC);
     }
 
-    if (!isset($config['custom_logo_collapsed'])) {
-        config_update_value('custom_logo_collapsed', 'pandora_logo_green_collapsed.png');
+    if (isset($config['custom_logo_collapsed']) === false) {
+        config_update_value('custom_logo_collapsed', HEADER_LOGO_DEFAULT_COLLAPSED);
     }
 
     if (is_metaconsole()) {
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 10539fae91..a02d140290 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -4237,6 +4237,82 @@ function html_print_image(
 }
 
 
+/**
+ * Function for print the logo in menu header.
+ *
+ * @param boolean $menuCollapsed If true, the menu is collapsed.
+ * @param boolean $return        If true, the formed element is returned.
+ *
+ * @return mixed.
+ */
+function html_print_header_logo_image(bool $menuCollapsed, bool $return=false)
+{
+    global $config;
+
+    if (defined('PANDORA_ENTERPRISE') === false) {
+        if ($config['style'] === 'pandora_black') {
+            $custom_logo = 'images/custom_logo/'.HEADER_LOGO_BLACK_CLASSIC;
+            $custom_logo_collapsed = 'images/custom_logo/'.HEADER_LOGO_DEFAULT_COLLAPSED;
+        } else if ($config['style'] === 'pandora') {
+            $custom_logo = 'images/custom_logo/'.HEADER_LOGO_DEFAULT_CLASSIC;
+            $custom_logo_collapsed = 'images/custom_logo/'.HEADER_LOGO_DEFAULT_COLLAPSED;
+        }
+
+        $logo_title = get_product_name().' Opensource';
+    } else {
+        // Handle default logos when change theme.
+        if ($config['style'] === 'pandora_black' && $config['custom_logo'] === HEADER_LOGO_DEFAULT_CLASSIC) {
+            $config['custom_logo'] = HEADER_LOGO_BLACK_CLASSIC;
+        } else if ($config['style'] === 'pandora' && $config['custom_logo'] === HEADER_LOGO_BLACK_CLASSIC) {
+            $config['custom_logo'] = HEADER_LOGO_DEFAULT_CLASSIC;
+        }
+
+        $logo_title = get_product_name().' Enterprise';
+        $custom_logo = 'images/custom_logo/'.$config['custom_logo'];
+
+        $custom_logo_collapsed = 'images/custom_logo/'.$config['custom_logo_collapsed'];
+
+        if (file_exists(ENTERPRISE_DIR.'/'.$custom_logo) === true) {
+            $custom_logo = ENTERPRISE_DIR.'/'.$custom_logo;
+        }
+    }
+
+    if (isset($config['custom_logo']) === true) {
+        $output = html_print_image(
+            $custom_logo,
+            true,
+            [
+                'border' => '0',
+                'width'  => '215',
+                'alt'    => $logo_title,
+                'class'  => 'logo_full',
+                'style'  => ($menuCollapsed === true) ? 'display:none' : 'display:block',
+            ]
+        );
+    }
+
+    if (isset($config['custom_logo_collapsed']) === true) {
+        $output .= html_print_image(
+            $custom_logo_collapsed,
+            true,
+            [
+                'border' => '0',
+                'width'  => '60',
+                'alt'    => $logo_title,
+                'class'  => 'logo_icon',
+                'style'  => ($menuCollapsed === true) ? 'display:block' : 'display:none',
+            ]
+        );
+    }
+
+    if ($return === false) {
+        echo $output;
+    } else {
+        return $output;
+    }
+}
+
+
 /**
  * Render an input text element. Extended version, use html_print_input_text() to simplify.
  *
diff --git a/pandora_console/include/lib/Core/DBMaintainer.php b/pandora_console/include/lib/Core/DBMaintainer.php
index 5bd0ba6695..aa09c385f8 100644
--- a/pandora_console/include/lib/Core/DBMaintainer.php
+++ b/pandora_console/include/lib/Core/DBMaintainer.php
@@ -384,7 +384,7 @@ final class DBMaintainer
      *
      * @return boolean Success or not.
      */
-    private function setConfigToken(string $token, $value)
+    public function setConfigToken(string $token, $value)
     {
         $prev = $this->getValue('tconfig', 'value', ['token' => $token]);
         // If failed or not found, then insert.
diff --git a/pandora_console/include/styles/events.css b/pandora_console/include/styles/events.css
index e3fa37529e..f666d6d687 100644
--- a/pandora_console/include/styles/events.css
+++ b/pandora_console/include/styles/events.css
@@ -115,6 +115,7 @@ table.dataTable tbody td {
   padding-top: 7px;
   padding-bottom: 7px;
   border-bottom: 2px solid #dedede;
+  word-break: break-all;
 }
 
 .filter_input {
diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css
index ebf201c761..7348875a45 100644
--- a/pandora_console/include/styles/menu.css
+++ b/pandora_console/include/styles/menu.css
@@ -399,7 +399,8 @@ ul li {
 }
 
 .logo_green {
-  height: 60px;
+  background-color: #fff;
+  min-height: 60px;
   display: flex;
   justify-content: center;
   align-items: center;
diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css
index 3db3587bef..0636455135 100644
--- a/pandora_console/include/styles/pandora_black.css
+++ b/pandora_console/include/styles/pandora_black.css
@@ -65,6 +65,9 @@ table.agent_info_table tr {
   color: #fff !important;
 }
 
+.logo_green {
+  background-color: #000;
+}
 #um-next:hover,
 #um-last:hover {
   border: 1px solid #888 !important;
@@ -1186,13 +1189,9 @@ a.pandora_pagination,
 }
 #box_online {
   background-image: url("../../images/update_pandora_black.jpg") !important;
-  background-position: left, left !important;
-  background-repeat: no-repeat;
   background-color: #000 !important;
   padding: 40px 50px;
   border: 1px solid #111 !important;
-  border-radius: 5px;
-  min-height: 600px;
   background-size: contain;
   box-shadow: 1px 1px 4px rgba(160, 160, 160, 0.514);
 }
diff --git a/pandora_console/include/styles/register.css b/pandora_console/include/styles/register.css
index b1d8068ef3..77d56dbc85 100644
--- a/pandora_console/include/styles/register.css
+++ b/pandora_console/include/styles/register.css
@@ -29,7 +29,7 @@ input[type="button"].submit-next {
   background: #fff;
   padding: 5px;
   font-size: 1.3em;
-  margin: 0.5em 1em 0.5em 0;
+  margin: 0.5em 0em;
   cursor: pointer;
   text-align: center;
   height: 30px;
@@ -71,7 +71,7 @@ div.submit_buttons_container {
   position: relative;
   margin: 10px auto 0px;
   bottom: 0px;
-  width: 90%;
+  width: 95%;
   clear: both;
   height: 4em;
 }
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index a43ba4e344..aaf676cf61 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -375,20 +375,17 @@ if (is_ajax() === true) {
                         }
 
                         $tmp->evento = str_replace('"', '', io_safe_output($tmp->evento));
-                        if (strlen($tmp->evento) >= 255) {
-                            $tmp->evento = ui_print_truncate_text($tmp->evento, 255, $tmp->evento, true, false);
-                        }
 
-                        if ($tmp->module_name) {
+                        if (empty($tmp->module_name) === false) {
                             $tmp->module_name = io_safe_output($tmp->module_name);
                         }
 
-                        if ($tmp->comments) {
+                        if (empty($tmp->comments) === false) {
                             $tmp->comments = ui_print_comments($tmp->comments);
                         }
 
                         // Show last event.
-                        if (isset($tmp->max_id_evento) && $tmp->max_id_evento !== $tmp->id_evento) {
+                        if (isset($tmp->max_id_evento) === true && $tmp->max_id_evento !== $tmp->id_evento) {
                             $max_event = db_get_row_sql(
                                 sprintf(
                                     'SELECT criticity, timestamp FROM %s
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 5d3d25f936..8c56a051ce 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.762
-%define release     220613
+%define release     220616
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
@@ -31,6 +31,7 @@ Requires:           php-gd, php-ldap, php-snmp, php-session, php-gettext
 Requires:           php-mysqlnd, php-mbstring, php-zip, php-zlib, php-curl
 Requires:           xorg-x11-fonts-75dpi, xorg-x11-fonts-misc, php-pecl-zip
 Requires:           graphviz
+Requires:           openldap-clients libzstd
 Provides:           %{name}-%{version}
 
 
diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec
index de2d2be11e..d67df879aa 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.762
-%define release     220613
+%define release     220616
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index a864c32583..b17922032b 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.762
-%define release     220613
+%define release     220616
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 0634f10555..37c58a0d4a 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -616,7 +616,7 @@ CREATE TABLE IF NOT EXISTS `talert_execution_queue` (
 CREATE TABLE IF NOT EXISTS `tattachment` (
   `id_attachment` INT UNSIGNED NOT NULL AUTO_INCREMENT,
   `id_incidencia` INT UNSIGNED NOT NULL DEFAULT 0,
-  `id_usuario` VARCHAR(60) NOT NULL DEFAULT '',
+  `id_usuario` VARCHAR(255) NOT NULL DEFAULT '',
   `filename` VARCHAR(255) NOT NULL DEFAULT '',
   `description` VARCHAR(150) DEFAULT '',
   `size` BIGINT UNSIGNED NOT NULL DEFAULT 0,
@@ -689,7 +689,7 @@ CREATE TABLE IF NOT EXISTS `tcontainer_item` (
 CREATE TABLE IF NOT EXISTS `tevento` (
   `id_evento` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
   `id_agente` INT NOT NULL DEFAULT 0,
-  `id_usuario` VARCHAR(100) NOT NULL DEFAULT '0',
+  `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0',
   `id_grupo` MEDIUMINT NOT NULL DEFAULT 0,
   `estado` TINYINT UNSIGNED NOT NULL DEFAULT 0,
   `timestamp` DATETIME NOT NULL DEFAULT '1970-01-01 00:00:00',
@@ -779,7 +779,7 @@ CREATE TABLE IF NOT EXISTS `tincidencia` (
   `cierre` DATETIME NOT NULL DEFAULT '1970-01-01 00:00:00',
   `titulo` TEXT,
   `descripcion` TEXT,
-  `id_usuario` VARCHAR(60) NOT NULL DEFAULT '',
+  `id_usuario` VARCHAR(255) NOT NULL DEFAULT '',
   `origen` VARCHAR(100) NOT NULL DEFAULT '',
   `estado` INT NOT NULL DEFAULT 0,
   `prioridad` INT NOT NULL DEFAULT 0,
@@ -1059,7 +1059,7 @@ CREATE TABLE IF NOT EXISTS `tnetwork_profile_pen` (
 CREATE TABLE IF NOT EXISTS `tnota` (
   `id_nota` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
   `id_incident` BIGINT UNSIGNED NOT NULL,
-  `id_usuario` VARCHAR(100) NOT NULL DEFAULT '0',
+  `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0',
   `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `nota` MEDIUMTEXT,
   PRIMARY KEY  (`id_nota`),
@@ -1172,7 +1172,7 @@ CREATE TABLE IF NOT EXISTS `tserver` (
 -- ----------------------------------------------------------------------
 CREATE TABLE IF NOT EXISTS `tsesion` (
   `id_sesion` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `id_usuario` VARCHAR(60) NOT NULL DEFAULT '0',
+  `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0',
   `ip_origen` VARCHAR(100) NOT NULL DEFAULT '',
   `accion` VARCHAR(100) NOT NULL DEFAULT '',
   `descripcion` TEXT,
@@ -1208,7 +1208,7 @@ CREATE TABLE IF NOT EXISTS `ttrap` (
   `value_custom` TEXT,
   `alerted` SMALLINT NOT NULL DEFAULT 0,
   `status` SMALLINT NOT NULL DEFAULT 0,
-  `id_usuario` VARCHAR(150) DEFAULT '',
+  `id_usuario` VARCHAR(255) DEFAULT '',
   `timestamp` DATETIME NOT NULL DEFAULT '1970-01-01 00:00:00',
   `priority` TINYINT UNSIGNED NOT NULL DEFAULT 2,
   `text` VARCHAR(255) DEFAULT '',
@@ -1260,7 +1260,7 @@ CREATE TABLE IF NOT EXISTS `tevent_filter` (
 -- Table `tusuario`
 -- ----------------------------------------------------------------------
 CREATE TABLE IF NOT EXISTS `tusuario` (
-  `id_user` VARCHAR(60) NOT NULL DEFAULT '0',
+  `id_user` VARCHAR(255) NOT NULL DEFAULT '0',
   `fullname` VARCHAR(255) NOT NULL,
   `firstname` VARCHAR(255) NOT NULL,
   `lastname` VARCHAR(255) NOT NULL,
@@ -1313,7 +1313,7 @@ CREATE TABLE IF NOT EXISTS `tusuario` (
 -- ----------------------------------------------------------------------
 CREATE TABLE IF NOT EXISTS `tusuario_perfil` (
   `id_up` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `id_usuario` VARCHAR(100) NOT NULL DEFAULT '',
+  `id_usuario` VARCHAR(255) NOT NULL DEFAULT '',
   `id_perfil` INT UNSIGNED NOT NULL DEFAULT 0,
   `id_grupo` INT NOT NULL DEFAULT 0,
   `no_hierarchy` TINYINT NOT NULL DEFAULT 0,
@@ -1328,7 +1328,7 @@ CREATE TABLE IF NOT EXISTS `tusuario_perfil` (
 -- ----------------------------------------------------------------------
 CREATE TABLE IF NOT EXISTS `tuser_double_auth` (
   `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `id_user` VARCHAR(60) NOT NULL,
+  `id_user` VARCHAR(255) NOT NULL,
   `secret` VARCHAR(20) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE (`id_user`),
@@ -1340,7 +1340,7 @@ CREATE TABLE IF NOT EXISTS `tuser_double_auth` (
 -- ----------------------------------------------------------------------
 CREATE TABLE IF NOT EXISTS `treset_pass_history` (
   `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `id_user` VARCHAR(60) NOT NULL,
+  `id_user` VARCHAR(255) NOT NULL,
   `reset_moment` DATETIME NOT NULL,
   `success` TINYINT NOT NULL,
   PRIMARY KEY (`id`)
@@ -1366,7 +1366,7 @@ CREATE TABLE IF NOT EXISTS `tnotification_source` (
 -- -----------------------------------------------------
 CREATE TABLE IF NOT EXISTS `tmensajes` (
   `id_mensaje` INT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `id_usuario_origen` VARCHAR(60) NOT NULL DEFAULT '',
+  `id_usuario_origen` VARCHAR(255) NOT NULL DEFAULT '',
   `mensaje` TEXT,
   `timestamp` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   `subject` VARCHAR(255) NOT NULL DEFAULT '',
@@ -1388,7 +1388,7 @@ CREATE TABLE IF NOT EXISTS `tmensajes` (
 -- ----------------------------------------------------------------------
 CREATE TABLE IF NOT EXISTS `tnotification_user` (
   `id_mensaje` INT UNSIGNED NOT NULL,
-  `id_user` VARCHAR(60) NOT NULL,
+  `id_user` VARCHAR(255) NOT NULL,
   `utimestamp_read` BIGINT,
   `utimestamp_erased` BIGINT,
   `postpone` INT,
@@ -1415,7 +1415,7 @@ CREATE TABLE IF NOT EXISTS `tnotification_group` (
 -- ----------------------------------------------------------------------
 CREATE TABLE IF NOT EXISTS `tnotification_source_user` (
   `id_source` BIGINT UNSIGNED NOT NULL,
-  `id_user` VARCHAR(60),
+  `id_user` VARCHAR(255),
   `enabled` INT DEFAULT NULL,
   `also_mail` INT DEFAULT NULL,
   PRIMARY KEY (`id_source`,`id_user`),
@@ -1443,7 +1443,7 @@ CREATE TABLE IF NOT EXISTS `tnotification_source_group` (
 CREATE TABLE IF NOT EXISTS `tnotification_source_group_user` (
   `id_source` BIGINT UNSIGNED NOT NULL,
   `id_group` MEDIUMINT UNSIGNED NOT NULL,
-  `id_user` VARCHAR(60),
+  `id_user` VARCHAR(255),
   `enabled` INT DEFAULT NULL,
   `also_mail` INT DEFAULT NULL,
   PRIMARY KEY (`id_source`,`id_user`),
@@ -1476,7 +1476,7 @@ CREATE TABLE IF NOT EXISTS `tnews` (
 -- ----------------------------------------------------------------------
 CREATE TABLE IF NOT EXISTS `tgraph` (
   `id_graph` INT UNSIGNED NOT NULL  AUTO_INCREMENT,
-  `id_user` VARCHAR(100) NOT NULL DEFAULT '',
+  `id_user` VARCHAR(255) NOT NULL DEFAULT '',
   `name` VARCHAR(150) NOT NULL DEFAULT '',
   `description` TEXT,
   `period` INT NOT NULL DEFAULT 0,
@@ -1514,7 +1514,7 @@ CREATE TABLE IF NOT EXISTS `tgraph_source` (
 -- ----------------------------------------------------------------------
 CREATE TABLE IF NOT EXISTS `treport` (
   `id_report` INT UNSIGNED NOT NULL  AUTO_INCREMENT,
-  `id_user` VARCHAR(100) NOT NULL DEFAULT '',
+  `id_user` VARCHAR(255) NOT NULL DEFAULT '',
   `name` VARCHAR(150) NOT NULL DEFAULT '',
   `description` TEXT,
   `private` TINYINT UNSIGNED NOT NULL DEFAULT 0,
@@ -1813,7 +1813,7 @@ CREATE TABLE IF NOT EXISTS `tplanned_downtime` (
   `type_downtime` VARCHAR(100) NOT NULL DEFAULT 'disabled_agents_alerts',
   `type_execution` VARCHAR(100) NOT NULL DEFAULT 'once',
   `type_periodicity` VARCHAR(100) NOT NULL DEFAULT 'weekly',
-  `id_user` VARCHAR(100) NOT NULL DEFAULT '0',
+  `id_user` VARCHAR(255) NOT NULL DEFAULT '0',
   PRIMARY KEY (  `id` ) 
 ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 
@@ -2036,7 +2036,7 @@ CREATE TABLE IF NOT EXISTS `tgroup_stat` (
 -- ----------------------------------------------------------------------
 CREATE TABLE IF NOT EXISTS `tnetwork_map` (
   `id_networkmap` INT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `id_user` VARCHAR(60)  NOT NULL,
+  `id_user` VARCHAR(255)  NOT NULL,
   `name` VARCHAR(100)  NOT NULL,
   `type` VARCHAR(20)  NOT NULL,
   `layout` VARCHAR(20)  NOT NULL,
@@ -2196,7 +2196,7 @@ CREATE TABLE IF NOT EXISTS `tnetflow_report_content` (
 -- ---------------------------------------------------------------------
 CREATE TABLE IF NOT EXISTS `tpassword_history` (
   `id_pass`  INT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `id_user` VARCHAR(60) NOT NULL,
+  `id_user` VARCHAR(255) NOT NULL,
   `password` VARCHAR(45) DEFAULT NULL,
   `date_begin` DATETIME,
   `date_end` DATETIME,
@@ -2249,7 +2249,7 @@ CREATE TABLE `tupdate_journal` (
   `version` VARCHAR(25) DEFAULT '',
   `type` VARCHAR(25) DEFAULT '',
   `origin` VARCHAR(25) DEFAULT '',
-  `id_user` VARCHAR(250) NOT NULL DEFAULT ''
+  `id_user` VARCHAR(255) NOT NULL DEFAULT ''
 ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 
 -- ---------------------------------------------------------------------
@@ -2298,7 +2298,7 @@ CREATE TABLE IF NOT EXISTS `tsessions_php` (
 CREATE TABLE IF NOT EXISTS `tmap` (
   `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
   `id_group` INT UNSIGNED NOT NULL DEFAULT 0,
-  `id_user` VARCHAR(250) NOT NULL DEFAULT '',
+  `id_user` VARCHAR(255) NOT NULL DEFAULT '',
   `type` INT UNSIGNED NOT NULL DEFAULT 0,
   `subtype` INT UNSIGNED NOT NULL DEFAULT 0,
   `name` VARCHAR(250) DEFAULT '',
@@ -2579,7 +2579,7 @@ CREATE TABLE IF NOT EXISTS `tpolicy_group_agents` (
 CREATE TABLE IF NOT EXISTS `tdashboard` (
   `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
   `name` TEXT NOT NULL DEFAULT '',
-  `id_user` VARCHAR(60) NOT NULL DEFAULT '',
+  `id_user` VARCHAR(255) NOT NULL DEFAULT '',
   `id_group` INT NOT NULL DEFAULT 0,
   `active` TINYINT NOT NULL DEFAULT 0,
   `cells` INT UNSIGNED DEFAULT 0,
@@ -3136,7 +3136,7 @@ CREATE TABLE IF NOT EXISTS `tnetworkmap_ent_rel_nodes` (
 -- -----------------------------------------------------
 CREATE TABLE IF NOT EXISTS `treport_template` (
   `id_report` INT UNSIGNED NOT NULL  AUTO_INCREMENT,
-  `id_user` VARCHAR(100) NOT NULL DEFAULT '',
+  `id_user` VARCHAR(255) NOT NULL DEFAULT '',
   `name` VARCHAR(150) NOT NULL DEFAULT '',
   `description` TEXT,
   `private` TINYINT UNSIGNED NOT NULL DEFAULT 0,
@@ -3305,7 +3305,7 @@ CREATE TABLE IF NOT EXISTS `tmetaconsole_event` (
   `id_source_event` BIGINT UNSIGNED NOT NULL,
   `id_agente` INT NOT NULL DEFAULT 0,
   `agent_name` VARCHAR(600) NOT NULL DEFAULT '',
-  `id_usuario` VARCHAR(100) NOT NULL DEFAULT '0',
+  `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0',
   `id_grupo` MEDIUMINT NOT NULL DEFAULT 0,
   `group_name` VARCHAR(100) NOT NULL DEFAULT '',
   `estado` TINYINT UNSIGNED NOT NULL DEFAULT 0,
@@ -3357,7 +3357,7 @@ CREATE TABLE IF NOT EXISTS `tmetaconsole_event_history` (
   `id_source_event` BIGINT UNSIGNED NOT NULL,
   `id_agente` INT NOT NULL DEFAULT 0,
   `agent_name` VARCHAR(600) NOT NULL DEFAULT '',
-  `id_usuario` VARCHAR(100) NOT NULL DEFAULT '0',
+  `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0',
   `id_grupo` MEDIUMINT NOT NULL DEFAULT 0,
   `group_name` VARCHAR(100) NOT NULL DEFAULT '',
   `estado` TINYINT UNSIGNED NOT NULL DEFAULT 0,
@@ -3521,7 +3521,7 @@ CREATE TABLE IF NOT EXISTS `tphase`(
 
 CREATE TABLE IF NOT EXISTS `treset_pass` (
   `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `id_user` VARCHAR(100) NOT NULL DEFAULT '',
+  `id_user` VARCHAR(255) NOT NULL DEFAULT '',
   `cod_hash` VARCHAR(100) NOT NULL DEFAULT '',
   `reset_time` INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`)
@@ -3672,7 +3672,7 @@ CREATE TABLE IF NOT EXISTS `tautoconfig` (
   `name` VARCHAR(100) NOT NULL,
   `order` INT NOT NULL DEFAULT 0,
   `description` TEXT,
-
+  `disabled` TINYINT DEFAULT 0,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 
@@ -3826,7 +3826,7 @@ CREATE TABLE IF NOT EXISTS `tuser_task` (
 -- ---------------------------------------------------------------------
 CREATE TABLE IF NOT EXISTS `tuser_task_scheduled` (
   `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `id_usuario` VARCHAR(60) NOT NULL DEFAULT '0',
+  `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0',
   `id_user_task` INT UNSIGNED NOT NULL DEFAULT 0,
   `args` TEXT,
   `scheduled` ENUM('no','hourly','daily','weekly','monthly','yearly','custom') DEFAULT 'no',
@@ -3845,7 +3845,7 @@ CREATE TABLE IF NOT EXISTS `tvisual_console_elements_cache` (
   `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
   `vc_id` INT UNSIGNED NOT NULL,
   `vc_item_id` INT UNSIGNED NOT NULL,
-  `user_id` VARCHAR(60) DEFAULT NULL,
+  `user_id` VARCHAR(255) DEFAULT NULL,
   `data` TEXT,
   `created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `expiration` INT UNSIGNED NOT NULL COMMENT 'Seconds to expire',
@@ -4225,7 +4225,7 @@ CREATE TABLE IF NOT EXISTS `tbackup` (
   `id` SERIAL,
   `utimestamp` BIGINT DEFAULT 0,
   `filename` VARCHAR(512) DEFAULT '',
-  `id_user` VARCHAR(60) DEFAULT '',
+  `id_user` VARCHAR(255) DEFAULT '',
   `description` MEDIUMTEXT,
   `pid` INT UNSIGNED DEFAULT 0,
   `filepath` VARCHAR(512) DEFAULT '',
diff --git a/pandora_console/update_manager_client/lib/UpdateManager/Client.php b/pandora_console/update_manager_client/lib/UpdateManager/Client.php
index 61dfd0a4e9..9b2af182ce 100644
--- a/pandora_console/update_manager_client/lib/UpdateManager/Client.php
+++ b/pandora_console/update_manager_client/lib/UpdateManager/Client.php
@@ -2229,7 +2229,7 @@ class Client
         if (is_callable($this->postUpdateFN) === true) {
             call_user_func(
                 $this->postUpdateFN,
-                $this->currentPackage,
+                (string) $version,
                 'server'
             );
         }
diff --git a/pandora_console/update_manager_client/resources/javascript/umc.js b/pandora_console/update_manager_client/resources/javascript/umc.js
index e5b3ba1a5c..af5832daba 100644
--- a/pandora_console/update_manager_client/resources/javascript/umc.js
+++ b/pandora_console/update_manager_client/resources/javascript/umc.js
@@ -460,7 +460,9 @@ function umShowUpdateDetails(update) {
   var um_update_details = document.getElementById("um-update-details");
   var header = document.getElementById("um-update-details-header");
   var content = document.getElementById("um-update-details-content");
-
+  var detailTitle = document
+    .getElementsByClassName("um-package-details")
+    .item(0).innerText;
   header.innerText = texts.updateText + " " + updates[update].version;
   content.innerText = updates[update].description;
 
@@ -468,8 +470,8 @@ function umShowUpdateDetails(update) {
     um_update_details.style.display = "block";
     if (typeof $ == "function") {
       $("#um-update-details").dialog({
-        title: update,
-        width: 650,
+        title: detailTitle,
+        width: 800,
         height: 600
       });
     }
diff --git a/pandora_console/update_manager_client/resources/styles/pandora.css b/pandora_console/update_manager_client/resources/styles/pandora.css
deleted file mode 100644
index 6003234002..0000000000
--- a/pandora_console/update_manager_client/resources/styles/pandora.css
+++ /dev/null
@@ -1,318 +0,0 @@
-.update_text p {
-  font-size: 11pt;
-}
-
-.update_text a {
-  font-size: 11pt;
-  color: #82b92e;
-}
-
-.update_manager_warning p {
-  font-size: 10pt;
-}
-
-.ui-widget-content,
-.ui-widget-content p {
-  font-size: 12pt;
-}
-.fileupload_form {
-  background-color: #373a3d;
-  background-image: -moz-linear-gradient(center, #373a3d, #313437);
-  border-radius: 3px;
-  margin: 0px;
-  padding: 30px;
-}
-#drop_file {
-  background-color: #e6e6e6;
-  border: 20px solid rgba(0, 0, 0, 0);
-  border-radius: 3px;
-  color: #707070;
-  font-size: 16px;
-  font-weight: bold;
-  margin-bottom: 30px;
-  padding: 40px 50px;
-  text-align: center;
-  text-transform: uppercase;
-}
-#drop_file table {
-  vertical-align: middle;
-}
-#drop_file table td,
-#drop_file table label {
-  color: #707070;
-  font-size: 16px;
-  font-weight: bold;
-  margin-top: 0;
-  vertical-align: middle;
-}
-#drop_file table select {
-  float: none;
-}
-#drop_file a {
-  background-color: #82b92e;
-  border-radius: 2px;
-  color: #ffffff;
-  cursor: pointer;
-  display: inline-block;
-  font-size: 14px;
-  line-height: 1;
-  padding: 12px 26px;
-}
-#drop_file a:hover {
-  background-color: #a6ce67;
-  text-decoration: none;
-}
-#drop_file input {
-  display: none;
-}
-
-.fileupload_form ul {
-  border-bottom: 1px solid #3d4043;
-  border-top: 1px solid #2b2e31;
-  list-style: none outside none;
-  margin: 0 -30px;
-  padding: 0;
-}
-.fileupload_form ul li {
-  background-color: #333639;
-  background-image: -moz-linear-gradient(center, #333639, #303335);
-  border-bottom: 1px solid #2b2e31;
-  border-top: 1px solid #3d4043;
-  padding: 15px;
-  position: relative;
-}
-.fileupload_form ul li #input-progress {
-  left: 68px;
-  position: absolute;
-}
-.fileupload_form ul li p {
-  color: #eeeeee;
-  font-size: 12px;
-  font-weight: bold;
-  left: 95px;
-  overflow: hidden;
-  position: absolute;
-  top: 12px;
-  white-space: nowrap;
-}
-.fileupload_form ul li i {
-  color: #7f7f7f;
-  display: block;
-  font-style: normal;
-  font-weight: normal;
-}
-.fileupload_form ul li canvas {
-  left: 13px;
-  position: absolute;
-  top: 15px;
-}
-.fileupload_form ul li span {
-  background: url("../images/check-cross.png") no-repeat scroll 0 0
-    rgba(0, 0, 0, 0);
-  cursor: pointer;
-  height: 12px;
-  position: absolute;
-  right: 13px;
-  top: 34px;
-  width: 15px;
-}
-.fileupload_form ul li div {
-  display: block !important;
-}
-.fileupload_form ul li.working span {
-  background-position: 0 -12px;
-  height: 16px;
-}
-.fileupload_form ul li.loading span {
-  background: url("../images/spinner.gif") no-repeat scroll 0 0 rgba(0, 0, 0, 0);
-  height: 16px;
-}
-.fileupload_form ul li.suc span {
-  background: url("../images/check-cross.png") no-repeat scroll 0 0
-    rgba(0, 0, 0, 0);
-  height: 12px;
-}
-.fileupload_form ul li.suc p {
-  color: #5a8629;
-}
-.fileupload_form ul li.error span {
-  background: url("../images/check-cross.png") no-repeat scroll 0 -12px rgba(0, 0, 0, 0);
-  height: 16px;
-}
-.fileupload_form ul li.error p {
-  color: #ff3333;
-}
-
-#log_zone {
-  background-color: #e6e6e6;
-  border: 20px solid rgba(0, 0, 0, 0);
-  border-radius: 3px;
-  color: #707070;
-  font-size: 12px;
-  margin-bottom: 30px;
-  padding: 10px;
-  text-align: left;
-}
-
-#box_online {
-  background-image: url("../images/update_manager_background.jpg");
-  background-position: center center;
-  background-repeat: no-repeat;
-  background-color: #fff;
-  padding: 40px 50px;
-  border: 1px solid #f3f3f3;
-  border-radius: 5px;
-  min-height: 600px;
-  background-size: contain;
-}
-
-div#box_online * {
-  font-size: 16pt;
-  margin-bottom: 50px;
-}
-
-#box_online .content {
-  max-width: 50%;
-}
-
-.update_popup {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding-left: 10px;
-  padding-right: 10px;
-}
-
-.update_icon {
-  padding-left: 20px;
-}
-
-.update_text h3 {
-  font-weight: bold;
-  font-size: 12pt;
-}
-
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
-  float: left;
-  padding-left: 19px;
-  padding-bottom: 5px;
-}
-
-a.update_manager_button {
-  padding: 10px 12px;
-  margin-top: 10px;
-  display: inline-flex;
-  align-items: center;
-  font-size: 16px;
-  border-radius: 4px;
-  text-decoration: none;
-}
-
-a.update_manager_button:after {
-  content: url(../images/update_manager_button.png);
-  padding-left: 10px;
-}
-
-.progressbar {
-  margin-top: 15px;
-}
-
-.ui-draggable,
-.ui-draggable .ui-dialog-titlebar {
-  cursor: default;
-}
-
-#box_online #pkg_version {
-  color: #82b92e;
-  font-size: 75pt;
-  font-weight: bold;
-  margin-bottom: 50px;
-}
-
-/* METACONSOLE */
-.box_online_meta {
-  background: none;
-  min-height: 400px;
-  text-align: center;
-  border: none;
-}
-
-div#box_online.box_online_meta * {
-  font-size: 14pt;
-}
-
-#box_online.box_online_meta .content {
-  max-width: 100%;
-}
-
-#box_online.box_online_meta #pkg_version {
-  font-size: 60pt;
-}
-
-/* COMMUNITY */
-.update_manager_open {
-  max-width: 50%;
-  font-size: 10pt;
-  margin-top: 40px;
-  padding: 20px;
-  border: 1px solid #eaeaea;
-  border-radius: 5px;
-}
-
-.update_manager_warning {
-  display: flex;
-  align-items: center;
-  margin-bottom: 10px;
-}
-
-.update_manager_warning img {
-  padding-right: 20px;
-  width: 90px;
-}
-
-a.update_manager_button_open {
-  padding: 5px 10px;
-  font-size: 16px;
-  text-decoration: none;
-  border: 1px solid #82b92e;
-  color: #82b92e;
-  border-radius: 2px;
-}
-
-a.update_manager_button_open:hover {
-  color: #fff;
-  background-color: #82b92e;
-}
-
-#um-update-details-header {
-  background-image: url(../images/pandora_logo.png);
-}
-
-.um-progress-bar {
-  background-color: #8bb92e !important;
-}
-
-.um-error {
-  color: #e63c52;
-}
-
-.um-success {
-  color: #8bb92e;
-}
-
-.dz-success-mark svg {
-  background: #8bb92e;
-  border-radius: 50%;
-}
-
-.newsletter_div {
-  font-size: 12pt;
-  margin: 5px 20px;
-  float: left;
-  padding-top: 23px;
-}
-.register_update_manager {
-  margin: 5px 0 10px;
-  float: left;
-  padding-left: 15px;
-}
diff --git a/pandora_console/update_manager_client/resources/styles/um.css b/pandora_console/update_manager_client/resources/styles/um.css
index a876a69219..d0208bd468 100644
--- a/pandora_console/update_manager_client/resources/styles/um.css
+++ b/pandora_console/update_manager_client/resources/styles/um.css
@@ -9,6 +9,58 @@
   margin: 5% auto;
   padding: 2em;
 }
+a.update_manager_button {
+  padding: 10px 12px;
+  margin-top: 10px;
+  display: inline-flex;
+  align-items: center;
+  font-size: 16px;
+  border-radius: 4px;
+  text-decoration: none;
+}
+
+a.update_manager_button:after {
+  content: url(../images/update_manager_button.png);
+  padding-left: 10px;
+}
+
+.progressbar {
+  margin-top: 15px;
+}
+
+#log_zone {
+  background-color: #e6e6e6;
+  border: 20px solid rgba(0, 0, 0, 0);
+  border-radius: 3px;
+  color: #707070;
+  font-size: 12px;
+  margin-bottom: 30px;
+  padding: 10px;
+  text-align: left;
+}
+
+#box_online {
+  background-image: url("../images/update_manager_background.jpg");
+  background-position: top right;
+  background-repeat: no-repeat;
+  background-color: #fff;
+  padding: 40px 50px;
+  border: 1px solid #f3f3f3;
+  border-radius: 5px;
+  min-height: 400px;
+  background-size: contain;
+}
+
+#box_online #pkg_version {
+  color: #82b92e;
+  font-size: 6em;
+  font-weight: bold;
+  margin: 30px 0 !important;
+}
+
+.update_manager_warning p {
+  font-size: 10pt;
+}
 #update-list {
   max-height: 0;
   overflow: hidden;
@@ -16,6 +68,31 @@
   flex-direction: column;
   transition: max-height 0.15s ease-in-out;
 }
+.update_popup {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding-left: 10px;
+  padding-right: 10px;
+}
+
+.update_icon {
+  padding-left: 20px;
+}
+
+.update_text h3 {
+  font-weight: bold;
+  font-size: 12pt;
+}
+
+.update_text p {
+  font-size: 11pt;
+}
+
+.update_text a {
+  font-size: 11pt;
+  color: #82b92e;
+}
 
 .update {
   display: flex;
@@ -23,13 +100,161 @@
   justify-content: space-around;
   align-items: center;
 }
+#drop_file {
+  background-color: #e6e6e6;
+  border: 20px solid rgba(0, 0, 0, 0);
+  border-radius: 3px;
+  color: #707070;
+  font-size: 16px;
+  font-weight: bold;
+  margin-bottom: 30px;
+  padding: 40px 50px;
+  text-align: center;
+  text-transform: uppercase;
+}
 
+#drop_file table {
+  vertical-align: middle;
+}
+
+#drop_file table td,
+#drop_file table label {
+  color: #707070;
+  font-size: 16px;
+  font-weight: bold;
+  margin-top: 0;
+  vertical-align: middle;
+}
+
+#drop_file table select {
+  float: none;
+}
+
+#drop_file a {
+  background-color: #82b92e;
+  border-radius: 2px;
+  color: #ffffff;
+  cursor: pointer;
+  display: inline-block;
+  font-size: 14px;
+  line-height: 1;
+  padding: 12px 26px;
+}
+
+#drop_file a:hover {
+  background-color: #a6ce67;
+  text-decoration: none;
+}
+
+#drop_file input {
+  display: none;
+}
+
+/* Offline form */
+.fileupload_form {
+  background-color: #373a3d;
+  background-image: -moz-linear-gradient(center, #373a3d, #313437);
+  border-radius: 3px;
+  margin: 0px;
+  padding: 30px;
+}
+
+.fileupload_form ul {
+  border-bottom: 1px solid #3d4043;
+  border-top: 1px solid #2b2e31;
+  list-style: none outside none;
+  margin: 0 -30px;
+  padding: 0;
+}
+
+.fileupload_form ul li {
+  background-color: #333639;
+  background-image: -moz-linear-gradient(center, #333639, #303335);
+  border-bottom: 1px solid #2b2e31;
+  border-top: 1px solid #3d4043;
+  padding: 15px;
+  position: relative;
+}
+
+.fileupload_form ul li #input-progress {
+  left: 68px;
+  position: absolute;
+}
+
+.fileupload_form ul li p {
+  color: #eeeeee;
+  font-size: 12px;
+  font-weight: bold;
+  left: 95px;
+  overflow: hidden;
+  position: absolute;
+  top: 12px;
+  white-space: nowrap;
+}
+
+.fileupload_form ul li i {
+  color: #7f7f7f;
+  display: block;
+  font-style: normal;
+  font-weight: normal;
+}
+
+.fileupload_form ul li canvas {
+  left: 13px;
+  position: absolute;
+  top: 15px;
+}
+
+.fileupload_form ul li span {
+  background: url("../images/check-cross.png") no-repeat scroll 0 0
+    rgba(0, 0, 0, 0);
+  cursor: pointer;
+  height: 12px;
+  position: absolute;
+  right: 13px;
+  top: 34px;
+  width: 15px;
+}
+
+.fileupload_form ul li div {
+  display: block !important;
+}
+
+.fileupload_form ul li.working span {
+  background-position: 0 -12px;
+  height: 16px;
+}
+
+.fileupload_form ul li.loading span {
+  background: url("../images/spinner.gif") no-repeat scroll 0 0 rgba(0, 0, 0, 0);
+  height: 16px;
+}
+
+.fileupload_form ul li.suc span {
+  background: url("../images/check-cross.png") no-repeat scroll 0 0
+    rgba(0, 0, 0, 0);
+  height: 12px;
+}
+
+.fileupload_form ul li.suc p {
+  color: #5a8629;
+}
+
+.fileupload_form ul li.error span {
+  background: url("../images/check-cross.png") no-repeat scroll 0 -12px rgba(0, 0, 0, 0);
+  height: 16px;
+}
+
+.fileupload_form ul li.error p {
+  top: 18px;
+  color: #ff3333;
+}
 #um-loading {
   background-image: url(../images/spinner.gif);
-  height: 1.3em;
+  height: 1em;
   background-repeat: no-repeat;
   background-size: contain;
-  text-indent: 6em;
+  text-indent: 4.5em;
 }
 
 #um-buttons {
@@ -64,7 +289,7 @@
 }
 
 #um-update-details * {
-  font-size: 16pt;
+  font-size: 10pt;
 }
 
 #um-update-details-header {
@@ -72,10 +297,10 @@
   background-color: #343434;
   background-repeat: no-repeat;
   background-position: 50% 20%;
-  height: 3em;
+  height: 1.8em;
   text-align: center;
   display: block;
-  padding-top: 5.7em;
+  padding-top: 5.3em;
   width: 100%;
 }
 #um-update-details-content {
@@ -115,11 +340,17 @@
   background-color: #1f282b;
 }
 
+div#box_online * {
+  font-size: 14pt;
+}
+
+#box_online .content {
+  max-width: 50%;
+}
 #box_offline form {
   background-color: #373a3d;
   background-image: -moz-linear-gradient(top, #373a3d, #313437);
   border-radius: 3px;
-  font-family: "PT Sans Narrow", sans-serif;
   margin: 0px;
   padding: 30px;
 }
@@ -180,7 +411,9 @@ span.warning {
   justify-content: space-between;
 }
 .ui-dialog-content.ui-widget-content p {
+  font-size: 10pt;
   word-break: keep-all;
+  text-align: justify;
 }
 
 .license_text {
@@ -204,3 +437,91 @@ input.error {
 textarea#signature {
   margin-top: 1em;
 }
+a.update_manager_button_open:hover {
+  color: #fff;
+  background-color: #82b92e;
+}
+
+#um-update-details-header {
+  background-image: url(../images/pandora_logo.png);
+  font-size: 16pt;
+}
+
+.um-progress-bar {
+  background-color: #8bb92e !important;
+}
+
+.um-error {
+  color: #e63c52;
+}
+
+.um-success {
+  color: #8bb92e;
+}
+
+.dz-success-mark svg {
+  background: #8bb92e;
+  border-radius: 50%;
+}
+
+.newsletter_div {
+  margin: 5px 20px;
+  float: left;
+  padding-top: 23px;
+}
+
+.register_update_manager {
+  margin: 5px 0 10px;
+  float: left;
+  padding-left: 15px;
+}
+
+/* METACONSOLE */
+.box_online_meta {
+  background: none;
+  min-height: 400px;
+  text-align: center;
+  border: none;
+}
+
+div#box_online.box_online_meta * {
+  font-size: 14pt;
+}
+
+#box_online.box_online_meta .content {
+  max-width: 100%;
+}
+
+#box_online.box_online_meta #pkg_version {
+  font-size: 60pt;
+}
+
+/* COMMUNITY */
+.update_manager_open {
+  max-width: 50%;
+  font-size: 10pt;
+  margin-top: 40px;
+  padding: 20px;
+  border: 1px solid #eaeaea;
+  border-radius: 5px;
+}
+
+.update_manager_warning {
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
+
+.update_manager_warning img {
+  padding-right: 20px;
+  width: 90px;
+}
+
+a.update_manager_button_open {
+  padding: 5px 10px;
+  font-size: 16px;
+  text-decoration: none;
+  border: 1px solid #82b92e;
+  color: #82b92e;
+  border-radius: 2px;
+}
diff --git a/pandora_console/update_manager_client/views/offline.php b/pandora_console/update_manager_client/views/offline.php
index 0278491228..ae64d92fde 100644
--- a/pandora_console/update_manager_client/views/offline.php
+++ b/pandora_console/update_manager_client/views/offline.php
@@ -45,7 +45,6 @@
     <script src="<?php $asset('resources/javascript/jquery.iframe-transport.js'); ?>" type="text/javascript"></script>
     <script src="<?php $asset('resources/javascript/jquery.knob.js'); ?>" type="text/javascript"></script>
     <link rel="stylesheet" href="<?php $asset('resources/styles/um.css'); ?>">
-    <link rel="stylesheet" href="<?php $asset('resources/styles/pandora.css'); ?>">
 </head>
 
 <div id="box_offline">
diff --git a/pandora_console/update_manager_client/views/online.php b/pandora_console/update_manager_client/views/online.php
index a72372f0f7..2ba4787dd4 100644
--- a/pandora_console/update_manager_client/views/online.php
+++ b/pandora_console/update_manager_client/views/online.php
@@ -31,7 +31,6 @@
 ?>
 <head>
     <link rel="stylesheet" href="<?php $asset('resources/styles/um.css'); ?>">
-    <link rel="stylesheet" href="<?php $asset('resources/styles/pandora.css'); ?>">
     <script src="<?php $asset('resources/javascript/umc.js'); ?>" type="text/javascript"></script>
 </head>
 
@@ -40,10 +39,10 @@
     <span class="loading" style="font-size: 18pt; display: none;">
         <img src="images/wait.gif">
     </span>
-    
-    <p style="font-weight: 600;">The latest version of package installed is:</p>
+
+    <p style="font-weight: 600;"><?php echo __('The latest version of package installed is').':'; ?></p>
     <div id="pkg_version"><?php echo $version; ?></div>
-    
+
     <div class="content">
         <?php
         if (empty($error) !== true) {
diff --git a/pandora_console/update_manager_client/views/register.php b/pandora_console/update_manager_client/views/register.php
index 45767ea1cc..b893479c23 100644
--- a/pandora_console/update_manager_client/views/register.php
+++ b/pandora_console/update_manager_client/views/register.php
@@ -41,28 +41,27 @@ $product_name = get_product_name(); ?>
     <script src="<?php $asset('resources/javascript/umc.js'); ?>" type="text/javascript"></script>
     <link rel="stylesheet" href="<?php $asset('resources/styles/jquery-ui.min.css'); ?>">
     <link rel="stylesheet" href="<?php $asset('resources/styles/um.css'); ?>">
-    <link rel="stylesheet" href="<?php $asset('resources/styles/pandora.css'); ?>">
 </head>
 
 <div id="registration_wizard" title="
-    <?php echo __('Register to Update Manager'); ?>
+    <?php echo __('Register to Warp Update'); ?>
     " class="invisible">
     <div class="register_update_manager">
         <?php echo html_print_image('images/pandora_circle_big.png', true); ?>
     </div>
 
-    <div class="newsletter_div">
-        <?php echo __('Keep this %s console up to date with latest updates.', $product_name); ?>
+    <div class="newsletter_div lato font_10pt">
+            <?php echo __('Keep this %s console up to date with latest updates.', $product_name); ?>
     </div>
 
     <div class="license_text both">
-        <p>
+        <p class="lato font_10pt">
             <?php
             echo __(
-                'When you subscribe to the %s Update Manager service, you accept that we
+                'When you subscribe to the Warp update service for %s, you accept that we
             register your %s instance as an identifier on a database owned by %s. This data will solely be used to
             provide you with information about %s and will not be conceded to third parties. You can unregister from
-            said database at any time from the Update Manager options.',
+            said database at any time from the Warp update options.',
                 $product_name,
                 $product_name,
                 $product_name,
@@ -71,12 +70,12 @@ $product_name = get_product_name(); ?>
             ?>
         </p>
 
-        <p>
-            <?php echo __('Visit our privacy policy for more information'); ?>: 
+        <p class="lato font_10pt">
+            <?php echo __('Visit our privacy policy for more information'); ?>:
             <a href="https://pandorafms.com/privacy-policy/" target="_blank">https://pandorafms.com/privacy-policy/</a>
         </p>
 
-        <input id="registration-email" type="email" placeholder="<?php echo __('Your email'); ?>" />
+        <input id="registration-email" class="lato" type="email" placeholder="<?php echo __('Your email'); ?>" />
     </div>
 
     <div class="submit_buttons_container">
@@ -86,7 +85,8 @@ $product_name = get_product_name(); ?>
                 __('Cancel'),
                 'cancel_registration',
                 false,
-                'class="ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd submit-cancel"',
+                'class="lato ui-widget
+            ui-state-default ui-corner-all ui-button-text-only sub upd submit-cancel"',
                 true
             );
             ?>
@@ -97,7 +97,7 @@ $product_name = get_product_name(); ?>
                 __('OK!'),
                 'register',
                 false,
-                'class="ui-widget
+                'class="lato ui-widget
             ui-state-default ui-corner-all ui-button-text-only sub ok submit-next w100px"',
                 true
             );
@@ -108,8 +108,8 @@ $product_name = get_product_name(); ?>
 
 <!-- Verification modal.. -->
 <div id="reg_ensure_cancel" title="Confirmation Required" class="invisible">
-    <div class="font_12_20">
-        <?php echo __('Are you sure you don\'t want to use update manager?'); ?>
+    <div class="lato font_10pt">
+        <?php echo __('Are you sure you don\'t want to use Warp update?'); ?>
         <p>
             <?php
             echo __(
@@ -124,7 +124,7 @@ $product_name = get_product_name(); ?>
 
 <!-- Results modal. -->
 <div id="reg_result" title="Registration process result" class="invisible">
-    <div id="reg_result_content" class="font_12_20">
+    <div id="reg_result_content" class="lato font_10pt">
     </div>
 </div>
 
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index aa9e8a47ec..88e8056af5 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.762-220613
+Version: 7.0NG.762-220616
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 27de524149..c7a1a53370 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.762-220613"
+pandora_version="7.0NG.762-220616"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 57ea747870..6a2dffb4bc 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.762";
-my $pandora_build = "220613";
+my $pandora_build = "220616";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm
index 232361a50f..083fb77f8e 100644
--- a/pandora_server/lib/PandoraFMS/DataServer.pm
+++ b/pandora_server/lib/PandoraFMS/DataServer.pm
@@ -583,6 +583,11 @@ sub process_xml_data ($$$$$) {
 							
 				$module_data->{'data'} = $data->{'value'};
 				my $data_timestamp = get_tag_value ($data, 'timestamp', $timestamp);
+
+				if ($pa_config->{'use_xml_timestamp'} eq '0' && defined($timestamp)) {
+					$data_timestamp = $timestamp;
+				}
+
 				process_module_data ($pa_config, $module_data, $server_id, $agent, $module_name,
 									 $module_type, $interval, $data_timestamp, $dbh, $new_agent);
 			}
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 0d6be46a1d..74c972bf88 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.762";
-my $pandora_build = "220613";
+my $pandora_build = "220616";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 820393a670..8c1e0fdab9 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.762
-%define release     220613
+%define release     220616
 
 Summary:            Pandora FMS Server
 Name:               %{name}
@@ -30,7 +30,7 @@ Requires:           perl(NetAddr::IP) net-snmp net-tools
 Requires:           perl(IO::Socket::INET6) perl(IO::Socket::SSL) perl(Net::Telnet)
 Requires:           fping nmap sudo perl(JSON)
 Requires:           perl(Time::HiRes) perl(Encode::Locale)
-Requires:           perl perl(Sys::Syslog) perl(HTML::Entities) perl(Geo::IP)
+Requires:           perl perl(Sys::Syslog) perl(HTML::Entities) perl(Geo::IP) expect
 
 %description
 Pandora FMS is a monitoring system for big IT environments. It uses remote tests, or local agents to grab information. Pandora supports all standard OS (Linux, AIX, HP-UX, Solaris and Windows XP,2000/2003), and support multiple setups in HA enviroments.
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index c929b470fa..7f8879a00c 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.762
-%define release     220613
+%define release     220616
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index d9d76e8c91..2cfa52c101 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.762"
-PI_BUILD="220613"
+PI_BUILD="220616"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 185ecd2b86..d9eb2ebdae 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -35,7 +35,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.762 Build 220613";
+my $version = "7.0NG.762 Build 220616";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 59a75bb3a8..5c6f848398 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.762 Build 220613";
+my $version = "7.0NG.762 Build 220616";
 
 # save program name for logging
 my $progname = basename($0);
diff --git a/tentacle/.gitignore b/tentacle/.gitignore
new file mode 100644
index 0000000000..c39a713dcc
--- /dev/null
+++ b/tentacle/.gitignore
@@ -0,0 +1,4 @@
+dist/
+blib/
+Makefile
+pm_to_blib
\ No newline at end of file
diff --git a/tentacle/Makefile.PL b/tentacle/Makefile.PL
new file mode 100644
index 0000000000..cc444b8524
--- /dev/null
+++ b/tentacle/Makefile.PL
@@ -0,0 +1,22 @@
+use 5.000;
+use ExtUtils::MakeMaker;
+
+my %ARGV = map { my @r = split /=/,$_; defined $r[1] or $r[1]=1; @r } @ARGV;
+my @exe_files = qw(tentacle_server);
+
+WriteMakefile(
+	INSTALLSITELIB  => '/usr/lib/perl5',
+	(($^O eq 'freebsd')
+		? (INSTALLSITELIB => '') : ()
+	),
+	($^O eq 'netbsd') ? (
+		INSTALLSITELIB => '',
+		INSTALLSITESCRIPT => '/usr/local/bin',
+	) :(),
+
+	NAME            => 'PandoraFMS',
+	AUTHOR 			=> 'Artica ST <info@artica.es>',
+	EXE_FILES 		=> [ @exe_files ],
+	PMLIBDIRS  		=> [ 'lib' ],
+	'dist'		=> { 'TAR' => 'tar', 'TARFLAGS' => 'cvfz', 'SUFFIX' => '.gz', 'COMPRESS' => 'gzip'}
+);
diff --git a/tentacle/NetBSD/tentacle_server b/tentacle/NetBSD/tentacle_server
new file mode 100755
index 0000000000..d945a134e8
--- /dev/null
+++ b/tentacle/NetBSD/tentacle_server
@@ -0,0 +1,1869 @@
+#!/usr/bin/perl
+##########################################################################
+# Tentacle Server
+# See https://pandorafms.com/docs/ for protocol description.
+# Tentacle have IANA assigned port tpc/41121 as official port.
+##########################################################################
+# Copyright (c) 2007-2008  Ramon Novoa  <rnovoa@artica.es>
+# Copyright (c) 2005-2010 Artica Soluciones Tecnologicas S.L
+#
+# tentacle_server.pl	Tentacle Server. See https://pandorafms.com/docs/ for
+#                       protocol description.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+##########################################################################
+
+package tentacle::server;
+=head1 NAME
+
+tentacle_server - Tentacle Server
+
+=head1 VERSION
+
+Version 0.6.1
+
+=head1 USAGE
+
+tentacle_server B<< -s F<storage_directory> >> [I<options>]
+
+=head1 DESCRIPTION
+
+B<tentacle_server(1)> is a server for B<tentacle>, a B<client/server> file transfer protocol that aims to be:
+
+=over
+
+=item    * Secure by design.
+
+=item    * Easy to use.
+
+=item    * Versatile and cross-platform. 
+
+=back 
+
+Tentacle was created to replace more complex tools like SCP and FTP for simple file transfer/retrieval, and switch from authentication mechanisms like .netrc, interactive logins and SSH keys to X.509 certificates. Simple password authentication over a SSL secured connection is supported too.
+
+The client and server (B<TCP port 41121>) are designed to be run from the command line or called from a shell script, and B<no configuration files are needed>. 
+
+=cut
+
+use strict;
+use warnings;
+use Getopt::Std;
+use IO::Select;
+use IO::Compress::Zip qw(zip $ZipError);
+use IO::Uncompress::Unzip qw(unzip $UnzipError);
+use threads;
+use Thread::Semaphore;
+use POSIX ":sys_wait_h";
+use Time::HiRes qw(usleep);
+use Scalar::Util qw(refaddr);
+use POSIX qw(strftime);
+
+# Constants for Win32 services.
+use constant WIN32_SERVICE_STOPPED => 0x01;
+use constant WIN32_SERVICE_RUNNING => 0x04;
+
+my $t_libwrap_installed = eval { require Authen::Libwrap } ? 1 : 0;
+
+if ($t_libwrap_installed) {
+	Authen::Libwrap->import( qw( hosts_ctl STRING_UNKNOWN ) );
+}
+
+# Log errors, 1 enabled, 0 disabled
+my $t_log = 0;
+
+# Log information, 1 enabled, 0 enabled
+my $t_log_hard = 0;
+
+my $SOCKET_MODULE;
+if ($^O eq 'MSWin32') {
+	# Only support INET on windows
+	require IO::Socket::INET;
+	$SOCKET_MODULE = 'IO::Socket::INET';
+} else {
+	$SOCKET_MODULE =
+		eval { require IO::Socket::INET6 } ? 'IO::Socket::INET6'
+		  : eval { require IO::Socket::INET }  ? 'IO::Socket::INET'
+		  : die $@;
+}
+
+# Service name for Win32.
+my $SERVICE_NAME="Tentacle Server";
+
+# Service parameters.
+my $SERVICE_PARAMS=join(' ', @ARGV);
+
+# Program version
+our $VERSION = '0.6.2';
+
+# IPv4 address to listen on
+my @t_addresses = ('0', '0.0.0.0');
+
+# Block size for socket read/write operations in bytes
+my $t_block_size = 1024;
+
+# Client socket
+my $t_client_socket;
+
+# Run as daemon, 1 true, 0 false
+my $t_daemon = 0;
+
+# Storage directory
+my $t_directory = '';
+
+# Filters
+my @t_filters;
+
+# Enable (1) or disable (0) insecure mode
+my $t_insecure = 0;
+
+# String containing quoted invalid file name characters
+my $t_invalid_chars = '\?\[\]\/\\\=\+\<\>\:\;\'\,\*\~';
+
+# Maximum number of simultaneous connections
+my $t_max_conn = 10;
+
+# Maximum file size allowed by the server in bytes
+my $t_max_size = 2000000;
+
+# File overwrite, 1 enabled, 0 disabled
+my $t_overwrite = 0;
+
+# Port to listen on
+my $t_port = 41121;
+
+# Server password
+my $t_pwd = '';
+
+# Do not output error messages, 1 enabled, 0 disabled
+my $t_quiet = 0;
+
+# Number of retries for socket read/write operations
+my $t_retries = 3;
+
+# Select handler
+my $t_select;
+
+# Semaphore
+my $t_sem :shared;
+
+# Server socket
+my @t_server_sockets;
+
+# Server select handler
+my $t_server_select;
+
+# Use SSL, 1 true, 0 false
+my $t_ssl = 0;
+
+# SSL ca certificate file
+my $t_ssl_ca = '';
+
+# SSL certificate file
+my $t_ssl_cert = '';
+
+# SSL private key file
+my $t_ssl_key = '';
+
+# SSL private key password
+my $t_ssl_pwd = '';
+
+# Timeout for socket read/write operations in seconds
+my $t_timeout = 1;
+
+# Address to proxy client requests to
+my $t_proxy_ip = undef;
+
+# Port to proxy client requests to
+my $t_proxy_port = 41121;
+
+# Proxy socket
+my $t_proxy_socket;
+
+# Proxy selected handler
+my $t_proxy_select;
+
+# Use libwrap, 1 true, 0 false
+my $t_use_libwrap = 0;
+
+# Program name for libwrap
+my $t_program_name = $0;
+$t_program_name =~ s/.*\///g;
+
+# Log file
+my $log_file = undef;
+
+################################################################################
+## SUB print_help
+## Print help screen.
+################################################################################
+sub print_help {
+	$" = ',';
+
+	print ("Usage: $0 -s <storage directory> [options]\n\n");
+	print ("Tentacle server v$VERSION. See https://pandorafms.com/docs/ for protocol description.\n\n");
+	print ("Options:\n");
+	print ("\t-a ip_addresses\tIP addresses to listen on (default @t_addresses).\n");
+	print ("\t               \t(Multiple addresses separated by comma can be defined.)\n");
+	print ("\t-c number\tMaximum number of simultaneous connections (default $t_max_conn).\n");
+	print ("\t-d\t\tRun as daemon.\n");
+	print ("\t-e cert\t\tOpenSSL certificate file. Enables SSL.\n");
+	print ("\t-f ca_cert\tVerify that the peer certificate is signed by a ca.\n");
+	print ("\t-F config_file\tConfiguration file full path.\n");
+	print ("\t-h\t\tShow help.\n");
+	print ("\t-I\t\tEnable insecure operations (file listing and moving).\n");
+	print ("\t-i\t\tFilters.\n");
+	print ("\t-k key\t\tOpenSSL private key file.\n");
+	print ("\t-l log_file\t\tFile to write logs.\n");
+	print ("\t-m size\t\tMaximum file size in bytes (default ${t_max_size}b).\n");
+	print ("\t-o\t\tEnable file overwrite.\n");
+	print ("\t-p port\t\tPort to listen on (default $t_port).\n");
+	print ("\t-q\t\tQuiet. Do now print error messages.\n");
+	print ("\t-r number\tNumber of retries for network opertions (default $t_retries).\n");
+	print ("\t-S (install|uninstall|run) Manage the win32 service.\n");
+	print ("\t-t time\t\tTime-out for network operations in seconds (default ${t_timeout}s).\n");
+	print ("\t-v\t\tBe verbose (display errors).\n");
+	print ("\t-V\t\tBe verbose on hard way (display errors and other info).\n");
+	print ("\t-w\t\tPrompt for OpenSSL private key password.\n");
+	print ("\t-x pwd\t\tServer password.\n");
+	print ("\t-b ip_address\tProxy requests to the given address.\n");
+	print ("\t-g port\t\tProxy requests to the given port.\n");
+	print ("\t-T\t\tEnable tcpwrappers support.\n");
+	print ("\t  \t\t(To use this option, 'Authen::Libwrap' should be installed.)\n\n");
+}
+
+################################################################################
+## SUB daemonize
+## Turn the current process into a daemon.
+################################################################################
+sub daemonize {
+	my $pid;
+
+	require POSIX;
+
+	chdir ('/') || error ("Cannot chdir to /: $!.");
+	umask 0;
+
+	open (STDIN, '/dev/null') || error ("Cannot read /dev/null: $!.");
+
+	# Do not be verbose when running as a daemon
+	open (STDOUT, '>/dev/null') || error ("Cannot write to /dev/null: $!.");
+	open (STDERR, '>/dev/null') || error ("Cannot write to /dev/null: $!.");
+
+	# Fork
+	$pid = fork ();
+	if (! defined ($pid)) {
+		error ("Cannot fork: $!.");
+	}
+
+	# Parent
+	if ($pid != 0) {
+		exit;
+	}
+
+	# Child
+	POSIX::setsid () || error ("Cannot start a new session: $!.");
+}
+
+################################################################################
+## SUB parse_options
+## Parse command line options and initialize global variables.
+################################################################################
+sub parse_options {
+	my %opts;
+	my $CONF = {};
+	my $token_value;
+	my $tmp;
+	my @t_addresses_tmp;
+
+	# Get options
+	if (getopts ('a:b:c:de:f:F:g:hIi:k:l:m:op:qr:s:S:t:TvVwx:', \%opts) == 0 || defined ($opts{'h'})) {
+		print_help ();
+		exit 1;
+	}
+
+	# The Win32 service must be installed/uninstalled without checking other parameters.
+	if (defined ($opts{'S'})) {
+		my $service_action = $opts{'S'};
+		if ($^O ne 'MSWin32') {
+			error ("Windows services are only available on Win32.");
+		} else {
+			eval "use Win32::Daemon";
+			die($@) if ($@);
+
+			if ($service_action eq 'install') {
+				install_service();
+			} elsif ($service_action eq 'uninstall') {
+				uninstall_service();
+			}
+		}
+	}
+
+	# Configuration file
+	if (defined($opts{'F'})) {
+		parse_config_file($opts{'F'}, $CONF);
+	}
+
+	# Address
+	$token_value = get_config_value($opts{'a'}, $CONF->{'addresses'});
+	if (defined ($token_value)) {
+		@t_addresses = ();
+		@t_addresses_tmp = split(/,/, $token_value);
+		
+		foreach my $t_address (@t_addresses_tmp) {
+			$t_address =~ s/^ *(.*?) *$/$1/;
+			if (($t_address ne '0') && 
+				($t_address !~ /^[a-zA-Z\.]+$/ && ($t_address  !~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/
+					|| $1 < 0 || $1 > 255 || $2 < 0 || $2 > 255
+					|| $3 < 0 || $3 > 255 || $4 < 0 || $4 > 255)) &&
+				($t_address !~ /^[0-9a-f:]+$/o)) {
+					error ("Address $t_address is not valid.");
+			}
+			push @t_addresses, $t_address;
+		}
+	}
+	
+	# Maximum simultaneous connections
+	$token_value = get_config_value($opts{'c'}, $CONF->{'max_connections'});
+	if (defined ($token_value)) {
+		$t_max_conn = $token_value;
+		if ($t_max_conn !~ /^\d+$/ || $t_max_conn < 1) {
+			error ("Invalid number of maximum simultaneous connections.");
+		}
+	}
+
+	# Run as daemon
+	$token_value = get_config_value($opts{'d'}, $CONF->{'daemon'}, 1);
+	if (defined ($token_value)) {
+		if ($^ eq 'MSWin32') {
+			error ("-d flag not available for this OS.");
+		}
+
+		$t_daemon = 1;
+	}
+
+	# Enable SSL
+	$token_value = get_config_value($opts{'e'}, $CONF->{'ssl_cert'});
+	if (defined ($token_value)) {
+
+		require IO::Socket::SSL;
+
+		$t_ssl_cert = $token_value;
+		if (! -f $t_ssl_cert) {
+			error ("File $t_ssl_cert does not exist.");
+		}
+
+		$t_ssl = 1;
+	}
+
+	# Verify peer certificate
+	$token_value = get_config_value($opts{'f'}, $CONF->{'ssl_ca'});
+	if (defined ($token_value)) {
+		$t_ssl_ca = $token_value;
+		if (! -f $t_ssl_ca) {
+			error ("File $t_ssl_ca does not exist.");
+		}
+	}
+
+	# Insecure mode
+	$token_value = get_config_value($opts{'I'}, $CONF->{'insecure'}, 1);
+	if (defined ($token_value)) {
+		$t_insecure = 1;
+	}
+
+	# Filters (regexp:dir;regexp:dir...)
+	$token_value = get_config_value($opts{'i'}, $CONF->{'filters'});
+	if (defined ($token_value)) {
+		my @filters = split (';', $token_value);
+		foreach my $filter (@filters) {
+			my ($regexp, $dir) = split (':', $filter);
+			next unless defined ($regexp) && defined ($dir);
+
+			# Remove any trailing /
+			my $char = chop ($dir);
+			$dir .= $char if ($char) ne '/';
+
+			push(@t_filters, [$regexp, $dir]);
+		}
+	}
+
+	# SSL private key file
+	$token_value = get_config_value($opts{'k'}, $CONF->{'ssl_key'});
+	if (defined ($token_value)) {
+		$t_ssl_key = $token_value;
+		if (! -f $t_ssl_key) {
+			error ("File $t_ssl_key does not exist.");
+		}
+	}
+
+	# Maximum file size
+	$token_value = get_config_value($opts{'m'}, $CONF->{'max_size'});
+	if (defined ($token_value)) {
+		$t_max_size = $token_value;
+		if ($t_max_size !~ /^\d+$/ || $t_max_size < 1) {
+			error ("Invalid maximum file size.");
+		}
+	}
+
+	# File overwrite
+	$token_value = get_config_value($opts{'o'}, $CONF->{'overwrite'}, 1);
+	if (defined ($token_value)) {
+		$t_overwrite = 1;
+	}
+
+	# Port
+	$token_value = get_config_value($opts{'p'}, $CONF->{'port'});
+	if (defined ($token_value)) {
+		$t_port = $token_value;
+		if ($t_port !~ /^\d+$/ || $t_port < 1 || $t_port > 65535) {
+			error ("Port $t_port is not valid.");
+		}
+	}
+
+	# Quiet mode
+	$token_value = get_config_value($opts{'q'}, $CONF->{'quiet'}, 1);
+	if (defined ($token_value)) {
+		$t_quiet = 1;
+	}
+
+	# Retries
+	$token_value = get_config_value($opts{'r'}, $CONF->{'retries'});
+	if (defined ($token_value)) {
+		$t_retries = $token_value;
+		if ($t_retries !~ /^\d+$/ || $t_retries < 1) {
+			error ("Invalid number of retries for network operations.");
+		}
+	}
+
+	# Storage directory
+	$token_value = get_config_value($opts{'s'}, $CONF->{'directory'});
+	if (defined ($token_value)) {
+
+		$t_directory = $token_value;
+		
+		# Check that directory exists
+		if (! -d $t_directory) {
+			error ("Directory $t_directory does not exist.");
+		}
+
+		# Check directory permissions
+		if (! -w $t_directory) {
+			error ("Cannot write to directory $t_directory.");
+		}
+
+		# Remove the trailing / if present
+		$tmp = chop ($t_directory);
+		if ($tmp ne '/') {
+			$t_directory .= $tmp;
+		}
+	}
+	else {
+		$token_value = get_config_value($opts{'b'}, $CONF->{'proxy_ip'});
+		if (! defined($token_value)) {
+			print_help ();
+			exit 1;
+		}
+	}
+
+	# Timeout
+	$token_value = get_config_value($opts{'t'}, $CONF->{'timeout'});
+	if (defined ($token_value)) {
+		$t_timeout = $token_value;
+		if ($t_timeout !~ /^\d+$/ || $t_timeout < 1) {
+			error ("Invalid timeout for network operations.");
+		}
+	}
+
+	# Read verbose from config file
+	if (defined($CONF->{'verbose'})) {
+		if ($CONF->{'verbose'} eq "1") {
+			$t_log = 1;
+		} elsif ($CONF->{'verbose'} eq "2") {
+			$t_log = 1;
+			$t_log_hard = 1;
+		}
+	}
+	# Be verbose
+	if (defined ($opts{'v'})) {
+		$t_log = 1;
+		$t_log_hard = 0;
+	}
+	# Be verbose hard
+	if (defined ($opts{'V'})) {
+		$t_log = 1;
+		$t_log_hard = 1;
+	}
+
+	# SSL private key password
+	$token_value = get_config_value($opts{'w'}, $CONF->{'ssl_password'}, 1);
+	if (defined ($token_value)) {
+		$t_ssl_pwd = ask_passwd ("Enter private key file password: ", "Enter private key file password again for confirmation: ");
+	}
+
+	# Server password
+	$token_value = get_config_value($opts{'x'}, $CONF->{'password'});
+	if (defined ($token_value)) {
+		$t_pwd = $token_value;
+	}
+	
+	#Proxy IP address
+	$token_value = get_config_value($opts{'b'}, $CONF->{'proxy_ip'});
+	if (defined ($token_value)) {
+		$t_proxy_ip = $token_value;
+		if ($t_proxy_ip !~ /^[a-zA-Z\.]+$/ && ($t_proxy_ip  !~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/
+			|| $1 < 0 || $1 > 255 || $2 < 0 || $2 > 255
+			|| $3 < 0 || $3 > 255 || $4 < 0 || $4 > 255) &&
+			$t_proxy_ip !~ /^[0-9a-f:]+$/o) {
+			error ("Proxy address $t_proxy_ip is not valid.");
+		}		
+	}
+	
+	# Proxy Port
+	$token_value = get_config_value($opts{'g'}, $CONF->{'proxy_port'});
+	if (defined ($token_value)) {
+		$t_proxy_port = $token_value;
+		if ($t_proxy_port !~ /^\d+$/ || $t_proxy_port < 1 || $t_proxy_port > 65535) {
+			error ("Proxy port $t_port is not valid.");
+		}
+	}	
+
+	# TCP wrappers support
+	$token_value = get_config_value($opts{'T'}, $CONF->{'use_libwrap'}, 1);
+	if (defined ($token_value)) {
+		if ($t_libwrap_installed) {
+			$t_use_libwrap = 1;
+		} else {
+			error ("Authen::Libwrap is not installed.");
+		}
+	}
+
+	# Win32 service management
+	if (defined ($opts{'S'})) {
+		my $service_action = $opts{'S'};
+		if ($^O ne 'MSWin32') {
+			error ("Windows services are only available on Win32.");
+		} else {
+			eval "use Win32::Daemon";
+			die($@) if ($@);
+
+			if ($service_action eq 'run') {
+				Win32::Daemon::RegisterCallbacks({
+			        start       =>  \&callback_start,
+			        running     =>  \&callback_running,
+			        stop        =>  \&callback_stop,
+				});
+				Win32::Daemon::StartService();
+				exit 0;
+			} else {
+				error("Unknown action: $service_action");
+			}
+		}
+	}
+	
+	# Get the config file
+	$token_value = get_config_value($opts{'l'}, $CONF->{'log_file'});
+	if (defined ($token_value)) {
+		$log_file = $token_value;
+	}
+
+	# No command lines config values
+
+	# Get the block size
+	if (defined ($CONF->{'block_size'})) {
+		if ($t_port !~ /^\d+$/ || $t_port < 1) {
+			error ("Invalid block size: " . $CONF->{'block_size'} . ".");
+		}
+		$t_block_size = $CONF->{'block_size'};
+	}
+
+	# Configuration file invalid chars
+	if (defined ($CONF->{'invalid_chars'})) {
+		$t_invalid_chars = $CONF->{'invalid_chars'};
+	}
+}
+
+################################################################################
+## SUB parse_config_file
+## Get all options from a config file.
+################################################################################
+sub parse_config_file {
+	my ($config_file, $CONF) = @_;
+
+	# File should be writable
+	if (! -r $config_file) {
+		print "Configuration file $config_file is not readable.\n";
+		return;
+	}
+
+	# Open the file
+	my $FH;
+	if (! open ($FH, "< $config_file")) {
+		print "Cannot open configuration file $config_file.\n";
+		return;
+	}
+
+	# Read the file and only get the well formed lines
+	while (<$FH>) {
+		my $buffer_line = $_;
+		if ($buffer_line =~ /^[a-zA-Z]/){ # begins with letters
+			if ($buffer_line =~ m/([\w\-\_\.]+)\s+(.*)/){
+				$CONF->{$1} = $2 unless $2 eq "";
+			}
+		}
+	}
+
+ 	close ($FH);
+	return;
+}
+
+################################################################################
+## SUB parse_config_file
+## Search in command line options and config hash from configuration file
+## to get a value (command line is a priority)
+################################################################################
+sub get_config_value {
+	my ($cmd_value, $conf_value, $bool) = @_;
+	$bool = 0 unless defined($bool);
+
+	return $cmd_value if defined($cmd_value);
+	# The boolean type value is 1 or undef (0 should be translated like undefP)
+	if ($bool && defined($conf_value)) {
+		return undef if ($conf_value ne "1");
+	}
+	return $conf_value;
+}
+
+################################################################################
+## SUB start_proxy
+## Open the proxy server socket.
+################################################################################
+sub start_proxy {
+
+	# Connect to server
+	$t_proxy_socket = $SOCKET_MODULE->new (
+	    PeerAddr => $t_proxy_ip,
+		PeerPort => $t_proxy_port,
+	);
+
+	if (! defined ($t_proxy_socket)) {
+		error ("Cannot connect to $t_proxy_ip on port $t_proxy_port: $!.");
+	}
+	
+	# Create proxy selector
+	$t_proxy_select = IO::Select->new ();
+	$t_proxy_select->add ($t_proxy_socket);
+	
+}
+
+################################################################################
+## SUB start_server
+## Open the server socket.
+################################################################################
+sub start_server {
+
+	my $t_server_socket;
+
+	foreach my $t_address (@t_addresses) {
+
+		$t_server_socket = $SOCKET_MODULE->new (
+			Listen    => $t_max_conn,
+			LocalAddr => $t_address,
+			LocalPort => $t_port,
+			Proto     => 'tcp',
+			ReuseAddr     => 1,
+		);
+
+		if (! defined ($t_server_socket)) {
+			print_log ("Cannot open socket for address $t_address on port $t_port: $!.");
+			next;
+		}
+
+		print_log ("Server listening on $t_address port $t_port (press <ctr-c> to stop)");
+	
+		# Say message if tentacle proxy is enable
+		if (defined ($t_proxy_ip)) {
+			print_log ("Proxy Mode enable, data will be sent to $t_proxy_ip port $t_proxy_port");	
+		}
+	
+		push @t_server_sockets, $t_server_socket;
+	}
+
+	if (!@t_server_sockets) {
+		error ("Cannot open socket for all addresses on port $t_port: $!.");
+	}
+	
+	$t_server_select = IO::Select->new();
+	foreach my $t_server_socket (@t_server_sockets){
+		$t_server_select->add($t_server_socket);
+ 	}
+}
+
+################################################################################
+## SUB send_data_proxy
+## Send data to proxy socket.
+################################################################################
+sub send_data_proxy {
+	my $data = $_[0];
+	my $block_size;
+	my $retries = 0;
+	my $size;
+	my $total = 0;
+	my $written;
+
+	$size = length ($data);
+
+	while (1) {
+
+		# Try to write data to the socket
+		if ($t_proxy_select->can_write ($t_timeout)) {
+
+			$block_size = ($size - $total) > $t_block_size ? $t_block_size : ($size - $total);
+			$written = syswrite ($t_proxy_socket, $data, $size - $total, $total);
+
+			# Write error
+			if (! defined ($written)) {
+				error ("Connection error from " . $t_proxy_socket->sockhost () . ": $!.");
+			}
+			
+			# EOF
+			if ($written == 0) {
+				error ("Connection from " . $t_proxy_socket->sockhost () . " unexpectedly closed.");
+			}
+	
+			$total += $written;
+
+			# Check if all data was written
+			if ($total == $size) {
+				return;
+			}
+		}
+		# Retry
+		else {
+			$retries++;
+			if ($retries > $t_retries) {
+				error ("Connection from " . $t_proxy_socket->sockhost () . " timed out.");
+			}
+		}
+	}
+}
+
+################################################################################
+## SUB close_proxy
+## Close the proxy socket.
+################################################################################
+sub close_proxy {
+	$t_proxy_socket->shutdown (2);
+	$t_proxy_socket->close ();
+}
+
+################################################################################
+## SUB stop_server
+## Close the server socket.
+################################################################################
+sub stop_server {
+
+	foreach my $t_server_socket (@t_server_sockets) {
+		$t_server_socket->shutdown (2);
+		$t_server_socket->close ();
+	}
+	print_log ("Server going down");
+	
+	exit 0;
+}
+
+################################################################################
+## SUB start_ssl
+## Convert the client socket to an IO::Socket::SSL socket.
+################################################################################
+sub start_ssl {
+	my $err;
+
+	if ($t_ssl_ca eq '') {
+		IO::Socket::SSL->start_SSL (
+			$t_client_socket,
+			SSL_cert_file => $t_ssl_cert,
+			SSL_key_file => $t_ssl_key,
+			SSL_passwd_cb => sub {return $t_ssl_pwd},
+			SSL_server => 1,
+			# Verify peer
+			SSL_verify_mode => 0x01,
+		);
+	}
+	else {
+		IO::Socket::SSL->start_SSL (
+			$t_client_socket,
+			SSL_ca_file => $t_ssl_ca,
+			SSL_cert_file => $t_ssl_cert,
+			SSL_key_file => $t_ssl_key,
+			SSL_passwd_cb => sub {return $t_ssl_pwd},
+			SSL_server => 1,
+			# Fail verification if no peer certificate exists
+			SSL_verify_mode => 0x03,
+		);
+	}
+
+	$err = IO::Socket::SSL::errstr ();
+	if ($err ne '') {
+		error ($err);
+	}
+
+	print_log ("SSL started for " . $t_client_socket->sockhost ());
+}
+
+################################################################################
+## SUB accept_connections
+## Manage incoming connections.
+################################################################################
+sub accept_connections {
+	my $pid;
+	my $t_server_socket;
+
+	# Ignore SIGPIPE
+	$SIG{PIPE} = 'IGNORE';
+
+	# Start server
+	start_server ();
+
+	# Initialize semaphore
+	$t_sem = Thread::Semaphore->new ($t_max_conn);
+
+	while (1) {
+		my @ready = $t_server_select->can_read;
+		foreach $t_server_socket (@ready) {
+
+			# Accept connection
+			$t_client_socket = $t_server_socket->accept ();
+
+			if (! defined ($t_client_socket)) {
+				next if ($! ne ''); # EINTR
+				error ("accept: $!.");
+			}
+
+			print_info ("Client connected from " . $t_client_socket->peerhost ());
+
+			if ($t_use_libwrap && (! hosts_ctl($t_program_name, $t_client_socket))) {
+				print_log ("Connection from " . $t_client_socket->peerhost() . " is closed by tcpwrappers.");
+				$t_client_socket->shutdown (2);
+				$t_client_socket->close();
+			}
+			else {
+
+				# Create a new thread and serve the client
+				$t_sem->down();
+				my $thr = threads->create(\&serve_client);
+				if (! defined ($thr)) {
+					error ("Error creating thread: $!.");
+				}
+				$thr->detach();
+				$t_client_socket->close ();
+			}
+		}
+
+		usleep (1000);
+	}
+}
+
+################################################################################
+## SUB serve_client
+## Serve a connected client.
+################################################################################
+sub serve_client() {
+
+	eval {		
+		# Add client socket to select queue
+		$t_select = IO::Select->new ();
+		$t_select->add ($t_client_socket);
+			
+		# Start SSL
+		if ($t_ssl == 1) {
+			start_ssl ();
+		}
+	
+		# Authenticate client
+		if ($t_pwd ne '') {
+			auth_pwd ();
+		}
+	
+		# Check if proxy mode is enable
+		if (defined ($t_proxy_ip)) {
+			serve_proxy_connection ();	
+		} else {
+			serve_connection ();
+		}
+	};
+
+	$t_client_socket->shutdown (2);
+	$t_client_socket->close ();
+	$t_sem->up();
+}
+
+################################################################################
+## SUB serve_proxy_connection
+## Actuate as a proxy between its client and other tentacle server.
+################################################################################
+sub serve_proxy_connection {
+	
+	# We are a proxy! Start a connection to the Tentacle Server.
+	start_proxy();
+
+	# Forward data between the client and the server.
+	eval {
+		my $select = IO::Select->new ();
+		$select->add($t_proxy_socket);
+		$select->add($t_client_socket);
+		while (my @ready = $select->can_read()) {
+			foreach my $socket (@ready) {
+				if (refaddr($socket) == refaddr($t_client_socket)) {
+					my ($read, $data) = recv_data($t_block_size);
+					return unless defined($data);
+					send_data_proxy($data);
+				}
+				else {
+					my ($read, $data) = recv_data_proxy($t_block_size);
+					return unless defined($data);
+					send_data($data);
+				}
+			}
+		}
+	};
+
+	# Close the connection to the Tentacle Server.
+	close_proxy();
+}
+
+################################################################################
+## SUB serve_connection
+## Read and process commands from the client.
+################################################################################
+sub serve_connection {
+	my $command;
+
+	# Read commands
+	while ($command = recv_command ($t_block_size)) {
+		
+		# Client wants to send a file
+		if ($command =~ /^SEND <(.*)> SIZE (\d+)$/) {
+			print_info ("Request to send file '$1' size ${2}b from " . $t_client_socket->sockhost ());
+			recv_file ($1, $2);
+		}
+		# Client wants to receive a file
+		elsif ($command =~ /^RECV <(.*)>$/) {
+			print_info ("Request to receive file '$1' from " . $t_client_socket->sockhost ());
+			send_file ($1);
+		}
+		elsif ($command =~ /^ZSEND <(.*)> SIZE (\d+)$/) {
+			print_info ("Request to send compressed file '$1' size ${2}b from " . $t_client_socket->sockhost ());
+			zrecv_file ($1, $2);
+		}
+		# Client wants to receive a file
+		elsif ($command =~ /^ZRECV <(.*)>$/) {
+			print_info ("Request to receive compressed file '$1' from " . $t_client_socket->sockhost ());
+			zsend_file ($1);
+		}
+		# Quit
+		elsif ($command =~ /^QUIT$/) {
+			print_info ("Connection closed from " . $t_client_socket->sockhost ());
+			last;
+		}
+		# File listing.
+		elsif ($command =~ /^LS <(.*)>$/) {
+			if ($t_insecure == 0) {
+				print_info ("Insecure mode disabled. Rejected request to list files matched by filter $1 from " . $t_client_socket->sockhost ());
+				last;
+			}
+
+			print_info ("Request to list files matched by filter $1 from " . $t_client_socket->sockhost ());
+			send_file_list ($1);
+		}
+		# Client wants to move a file
+		elsif ($command =~ /^MV <(.*)>$/) {
+			if ($t_insecure == 0) {
+				print_info ("Insecure mode disabled. Rejected request to move file $1 from " . $t_client_socket->sockhost ());
+				last;
+			}
+
+			print_info ("Request to move file '$1' from " . $t_client_socket->sockhost ());
+			move_file ($1);
+		}
+		# Unknown command
+		else {
+			print_log ("Unknown command '$command' from " . $t_client_socket->sockhost ());
+			last;
+		}
+	}
+}
+
+################################################################################
+## SUB auth_pwd
+## Authenticate client with server password.
+################################################################################
+sub auth_pwd {
+	my $client_digest;
+	my $command;
+	my $pwd_digest;
+
+	require Digest::MD5;
+	
+	# Wait for password
+	$command = recv_command ($t_block_size);
+	if ($command !~ /^PASS (.*)$/) {
+		error ("Client " . $t_client_socket->sockhost () . " did not authenticate.");
+	}
+	
+	$client_digest = $1;
+	$pwd_digest = Digest::MD5::md5 ($t_pwd);
+	$pwd_digest = Digest::MD5::md5_hex ($pwd_digest);
+
+	if ($client_digest ne $pwd_digest) {
+		error ("Invalid password from " . $t_client_socket->sockhost () . ".");
+	}
+
+	print_log ("Client " . $t_client_socket->sockhost () . " authenticated");
+	send_data ("PASS OK\n");
+}
+
+################################################################################
+## SUB recv_file
+## Receive a file of size $_[1] and save it in $t_directory as $_[0].
+################################################################################
+sub recv_file {
+	my $base_name = $_[0];
+	my $data = '';
+	my $file;
+	my $size = $_[1];
+
+	# Check file name
+	if ($base_name =~ /[$t_invalid_chars]/) {
+		print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " has an invalid file name");
+		send_data ("SEND ERR (invalid file name)\n");
+		return;
+	}
+
+	# Check file size, empty files are not allowed
+	if ($size < 1 || $size > $t_max_size) {
+		print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " is too big");
+		send_data ("SEND ERR (file is too big)\n");
+		return;
+	}
+	
+	# Apply filters
+	$file = "$t_directory/" . apply_filters ($base_name) . $base_name;
+
+	# Check if file exists
+	if (-f $file && $t_overwrite == 0) {
+		print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " already exists");
+		send_data ("SEND ERR (file already exists)\n");
+		return;
+	}
+
+	send_data ("SEND OK\n");
+
+	# Receive file
+	$data = recv_data_block ($size);
+
+	# Write it to disk
+	open (FILE, "> $file") || error ("Cannot open file '$file' for writing.");
+	binmode (FILE);
+	print (FILE $data);
+	close (FILE);
+
+	send_data ("SEND OK\n");
+	print_info ("Received file '$base_name' size ${size}b from " . $t_client_socket->sockhost ());
+}
+
+################################################################################
+## SUB zrecv_file
+## Receive a compressed file of size $_[1] and save it in $t_directory as $_[0].
+################################################################################
+sub zrecv_file {
+	my $base_name = $_[0];
+	my $data = '';
+	my $file;
+	my $size = $_[1];
+	my $zdata = '';
+
+	# Check file name
+	if ($base_name =~ /[$t_invalid_chars]/) {
+		print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " has an invalid file name");
+		send_data ("ZSEND ERR (invalid file name)\n");
+		return;
+	}
+
+	# Check file size, empty files are not allowed
+	if ($size < 1 || $size > $t_max_size) {
+		print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " is too big");
+		send_data ("ZSEND ERR (file is too big)\n");
+		return;
+	}
+	
+	# Apply filters
+	$file = "$t_directory/" . apply_filters ($base_name) . $base_name;
+
+	# Check if file exists
+	if (-f $file && $t_overwrite == 0) {
+		print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " already exists");
+		send_data ("ZSEND ERR (file already exists)\n");
+		return;
+	}
+
+	send_data ("ZSEND OK\n");
+
+	# Receive file
+	$zdata = recv_data_block ($size);
+	if (!unzip(\$zdata => \$data)) {
+		print_log ("Uncompress error: $UnzipError");
+		send_data ("ZSEND ERR\n");
+		return;
+	}
+
+	# Write it to disk
+	open (FILE, "> $file") || error ("Cannot open file '$file' for writing.");
+	binmode (FILE);
+	print (FILE $data);
+	close (FILE);
+
+	send_data ("ZSEND OK\n");
+	print_info ("Received compressed file '$base_name' size ${size}b from " . $t_client_socket->sockhost ());
+}
+
+################################################################################
+## SUB send_file
+## Send a file to the client
+################################################################################
+sub send_file {
+	my $base_name = $_[0];
+	my $data = '';
+	my $file;
+	my $response;
+	my $size;
+
+	# Check file name
+	if ($base_name =~ /[$t_invalid_chars]/) {
+		print_log ("Requested file '$base_name' from " . $t_client_socket->sockhost () . " has an invalid file name");
+		send_data ("RECV ERR (file has an invalid file name)\n");
+		return;
+	}
+	
+	# Apply filters
+	$file = "$t_directory/" . apply_filters ($base_name) . $base_name;
+
+	# Check if file exists
+	if (! -f $file) {
+		print_log ("Requested file '$file' from " . $t_client_socket->sockhost () . " does not exist");
+		send_data ("RECV ERR (file does not exist)\n");
+		return;
+	}
+
+	$size = -s $file;
+	send_data ("RECV SIZE $size\n");
+	
+	# Wait for client response
+	$response = recv_command ($t_block_size);
+	if ($response ne "RECV OK") {
+		print_log ("Requested file '$file' from " . $t_client_socket->sockhost () . " not sent");
+		return;
+	}
+
+	# Send the file
+	open (FILE, $file) || error ("Cannot open file '$file' for reading.");
+	binmode (FILE);
+	{
+		local $/ = undef;
+		$data = <FILE>;
+	}
+
+	send_data ($data);
+	close (FILE);
+
+	print_log ("Requested file '$file' from " . $t_client_socket->sockhost () . " sent");
+}
+
+################################################################################
+## SUB zsend_file
+## Send a file to the client
+################################################################################
+sub zsend_file {
+	my $base_name = $_[0];
+	my $data = '';
+	my $file;
+	my $response;
+	my $size;
+
+	# Check file name
+	if ($base_name =~ /[$t_invalid_chars]/) {
+		print_log ("Requested compressed file '$base_name' from " . $t_client_socket->sockhost () . " has an invalid file name");
+		send_data ("ZRECV ERR (file has an invalid file name)\n");
+		return;
+	}
+	
+	# Apply filters
+	$file = "$t_directory/" . apply_filters ($base_name) . $base_name;
+
+	# Check if file exists
+	if (! -f $file) {
+		print_log ("Requested compressed '$file' from " . $t_client_socket->sockhost () . " does not exist");
+		send_data ("ZRECV ERR (file does not exist)\n");
+		return;
+	}
+
+	# Read the file and compress its contents
+	if (! zip($file => \$data)) {
+		send_data ("QUIT\n");
+		error ("Compression error: $ZipError");
+		return;
+	}
+
+	$size = length($data);
+	send_data ("ZRECV SIZE $size\n");
+	
+	# Wait for client response
+	$response = recv_command ($t_block_size);
+	if ($response ne "ZRECV OK") {
+		print_log ("Requested compressed '$file' from " . $t_client_socket->sockhost () . " not sent");
+		return;
+	}
+
+	# Send the file
+	send_data ($data);
+
+	print_log ("Requested compressed '$file' from " . $t_client_socket->sockhost () . " sent");
+}
+
+################################################################################
+# Common functions
+################################################################################
+
+################################################################################
+## SUB print_log
+## Print log messages.
+################################################################################
+sub print_log($) {
+
+	my ($msg) = @_;
+	
+	return unless ($t_log == 1);
+	
+	my $fh = *STDOUT;
+	if (defined($log_file)) {
+		open($fh, ">>", $log_file) || die("Starting log failed: $!.\n");
+	}
+
+	print ($fh strftime ("%Y-%m-%d %H:%M:%S", localtime()) . "[log]$msg.\n");
+
+	close ($fh) if (defined($log_file));
+
+}
+
+################################################################################
+## SUB print_log
+## Print log messages.
+################################################################################
+sub print_info($) {
+
+	my ($msg) = @_;
+	
+	return unless ($t_log_hard == 1);
+	
+	my $fh = *STDOUT;
+	if (defined($log_file)) {
+		open($fh, ">>", $log_file) || die("Starting log failed: $!.\n");
+	}
+
+	print ($fh strftime ("%Y-%m-%d %H:%M:%S", localtime()) . "[info]$msg.\n");
+
+	close ($fh) if (defined($log_file));
+
+}
+
+################################################################################
+## SUB error
+## Print an error and exit the program.
+################################################################################
+sub error {
+
+	my ($msg) = @_;
+	
+	return unless ($t_quiet == 0);
+
+	my $fh = *STDERR;
+	if (defined($log_file)) {
+		open($fh, ">>", $log_file) || die("$!\n");
+	}
+
+	print ($fh strftime ("%Y-%m-%d %H:%M:%S", localtime()) . "[err]$msg\n");
+
+	close ($fh) if (defined($log_file));
+
+	die("\n");
+}
+
+################################################################################
+## SUB move_file
+## Send a file to the client and delete it
+################################################################################
+sub move_file {
+	my $base_name = $_[0];
+	my $data = '';
+	my $file;
+	my $response;
+	my $size;
+
+	# Check file name
+	if ($base_name =~ /[$t_invalid_chars]/) {
+		print_log ("Requested file '$base_name' from " . $t_client_socket->sockhost () . " has an invalid file name");
+		send_data ("MV ERR\n");
+		return;
+	}
+	
+	# Apply filters
+	$file = "$t_directory/" . apply_filters ($base_name) . $base_name;
+
+	# Check if file exists
+	if (! -f $file) {
+		print_log ("Requested file '$file' from " . $t_client_socket->sockhost () . " does not exist");
+		send_data ("MV ERR\n");
+		return;
+	}
+
+	$size = -s $file;
+	send_data ("MV SIZE $size\n");
+	
+	# Wait for client response
+	$response = recv_command ($t_block_size);
+	if ($response ne "MV OK") {
+		print_log ("Requested file '$file' from " . $t_client_socket->sockhost () . " not sent");
+		return;
+	}
+
+	# Send the file
+	open (FILE, $file) || error ("Cannot open file '$file' for reading.");
+	binmode (FILE);
+
+	while ($data = <FILE>) {
+		send_data ($data);
+	}
+
+	close (FILE);
+	unlink($file);
+
+	print_log ("Requested file '$file' from " . $t_client_socket->sockhost () . " sent and deleted");
+}
+
+################################################################################
+## SUB send_file_list
+## Send a list of files to the client after applying the given filter.
+################################################################################
+sub send_file_list {
+	my $filter = $_[0];
+	my $data = '';
+	my $dir;
+	my $dh;
+	my $response;
+	my $size;
+
+	# Check file name
+	if ($filter =~ /[$t_invalid_chars]/) {
+		print_log ("Invalid file listing filter '$filter' from " . $t_client_socket->sockhost ());
+		send_data ("LS ERR\n");
+		return;
+	}
+	
+	# Apply filters
+	$dir = "$t_directory/" . apply_filters ($filter);
+
+	# Open the directory.
+	if (! opendir ($dh, $dir)) {
+		print_log ("Error opening directory $dir as requested from " . $t_client_socket->sockhost () . ": $!");
+		send_data ("LS ERR\n");
+		return;
+	}
+
+	# List files.
+	while (my $file = readdir ($dh)) {
+		next if ($file =~ /[$t_invalid_chars]/); # Only list files valid for Tentacle.
+		$data .= "$file\n";
+	}
+	closedir $dh;
+
+	$size = length ($data);
+	send_data ("LS SIZE $size\n");
+	
+	# Wait for client response
+	$response = recv_command ($t_block_size);
+	if ($response ne "LS OK") {
+		print_log ("Requested directory listing from " . $t_client_socket->sockhost () . " not sent");
+		return;
+	}
+
+	send_data ($data);
+
+	print_log ("Requested directory listing from " . $t_client_socket->sockhost () . " sent");
+}
+
+################################################################################
+## SUB recv_data_proxy
+## Recv data from proxy socket.
+################################################################################
+sub recv_data_proxy {
+	my $data;
+	my $read;
+	my $retries = 0;
+	my $size = $_[0];
+
+	while (1) {
+
+		# Try to read data from the socket
+		if ($t_proxy_select->can_read ($t_timeout)) {
+			
+			# Read at most $size bytes
+			$read = sysread ($t_proxy_socket, $data, $size);
+
+			# Read error
+			if (! defined ($read)) {
+				error ("Read error from " . $t_proxy_socket->sockhost () . ": $!.");
+			}
+	
+			# EOF
+			if ($read == 0) {
+				error ("Connection from " . $t_proxy_socket->sockhost () . " unexpectedly closed.");
+			}
+	
+			return ($read, $data);
+		}
+
+		# Retry
+		$retries++;
+
+		# But check for error conditions first
+		if ($retries > $t_retries) {
+			error ("Connection from " . $t_proxy_socket->sockhost () . " timed out.");
+		}
+	}
+}
+################################################################################
+## SUB recv_data
+## Read data from the client socket. Returns the number of bytes read and the
+## string of bytes as a two element array.
+################################################################################
+sub recv_data {
+	my $data;
+	my $read;
+	my $retries = 0;
+	my $size = $_[0];
+
+	while (1) {
+
+		# Try to read data from the socket
+		if ($t_select->can_read ($t_timeout)) {
+			
+			# Read at most $size bytes
+			$read = sysread ($t_client_socket, $data, $size);
+
+			# Read error
+			if (! defined ($read)) {
+				error ("Read error from " . $t_client_socket->sockhost () . ": $!.");
+			}
+	
+			# EOF
+			if ($read == 0) {
+				error ("Connection from " . $t_client_socket->sockhost () . " unexpectedly closed.");
+			}
+	
+			return ($read, $data);
+		}
+
+		# Retry
+		$retries++;
+
+		# But check for error conditions first
+		if ($retries > $t_retries) {
+			error ("Connection from " . $t_client_socket->sockhost () . " timed out.");
+		}
+	}
+}
+
+################################################################################
+## SUB send_data
+## Write data to the client socket.
+################################################################################
+sub send_data {
+	my $data = $_[0];
+	my $block_size;
+	my $retries = 0;
+	my $size;
+	my $total = 0;
+	my $written;
+
+	$size = length ($data);
+
+	while (1) {
+
+		# Try to write data to the socket
+		if ($t_select->can_write ($t_timeout)) {
+
+			$block_size = ($size - $total) > $t_block_size ? $t_block_size : ($size - $total);
+			$written = syswrite ($t_client_socket, $data, $block_size, $total);
+
+			# Write error
+			if (! defined ($written)) {
+				error ("Connection error from " . $t_client_socket->sockhost () . ": $!.");
+			}
+			
+			# EOF
+			if ($written == 0) {
+				error ("Connection from " . $t_client_socket->sockhost () . " unexpectedly closed.");
+			}
+	
+			$total += $written;
+
+			# Check if all data was written
+			if ($total == $size) {
+				return;
+			}
+		}
+		# Retry
+		else {
+			$retries++;
+			if ($retries > $t_retries) {
+				error ("Connection from " . $t_client_socket->sockhost () . " timed out.");
+			}
+		}
+	}
+}
+
+################################################################################
+## SUB recv_command
+## Read a command from the client, ended by a new line character.
+################################################################################
+sub recv_command {
+	my $buffer;
+	my $char;
+	my $command = '';
+	my $read;
+	my $total = 0;
+
+	while (1) {
+		
+		($read, $buffer) = recv_data ($t_block_size);
+		$command .= $buffer;
+		$total += $read;
+
+		# Check if the command is complete
+		$char = chop ($command);
+		if ($char eq "\n") {
+			return $command;
+		}
+	
+		$command .= $char;
+
+		# Avoid overflow
+		if ($total > $t_block_size) {
+			error ("Received too much data from " . $t_client_socket->sockhost () . ".");
+		}
+	}
+}
+
+################################################################################
+## SUB recv_data_block
+## Read $_[0] bytes of data from the client.
+################################################################################
+sub recv_data_block {
+	my $buffer = '';
+	my $data = '';
+	my $read;
+	my $size = $_[0];
+	my $total = 0;
+
+	while (1) {
+
+		($read, $buffer) = recv_data ($size - $total);
+		$data .= $buffer;
+		$total += $read;
+
+		# Check if all data has been read
+		if ($total == $size) {
+			return $data;
+		}
+	}
+}
+
+################################################################################
+## SUB ask_passwd
+## Asks the user for a password.
+################################################################################
+sub ask_passwd {
+	my $msg1 = $_[0];
+	my $msg2 = $_[1];
+	my $pwd1;
+	my $pwd2;
+
+	require Term::ReadKey;
+
+	# Disable keyboard echo
+	Term::ReadKey::ReadMode('noecho');
+	
+	# Promt for password
+	print ($msg1);
+	$pwd1 = Term::ReadKey::ReadLine(0);
+	print ("\n$msg2");
+	$pwd2 = Term::ReadKey::ReadLine(0);
+	print ("\n");
+
+	# Restore original settings
+	Term::ReadKey::ReadMode('restore');
+
+	if ($pwd1 ne $pwd2) {
+		print ("Error: passwords do not match.\n");
+		exit 1;
+	}
+
+	# Remove the trailing new line character
+	chop $pwd1;
+
+	return $pwd1;
+}
+
+################################################################################
+## SUB apply_filters
+## Applies filters to the given file.
+################################################################################
+sub apply_filters ($) {
+	my ($file_name) = @_;
+
+	foreach my $filter (@t_filters) {
+		my ($regexp, $dir) = @{$filter};
+		if ($file_name =~ /$regexp/) {
+			print_log ("File '$file_name' matches filter '$regexp' (changing to directory '$dir')");
+			return $dir . '/';
+		}
+	}
+
+	return '';
+}
+
+################################################################################
+## SUB install_service
+## Install the Windows service.
+################################################################################
+sub install_service() {
+
+	my $service_path = $0;
+	my $service_params = $SERVICE_PARAMS;
+
+	# Change the service parameter from 'install' to 'run'.
+	$service_params =~ s/\-S\s+\S+/\-S run/;
+
+	my %service_hash = (
+		machine =>  '',
+		name	=>  'TENTACLESRV',
+		display =>  $SERVICE_NAME,
+		path	=>  $service_path,
+		user	=>  '',
+		pwd	 =>  '',
+		description => 'Tentacle Server http://sourceforge.net/projects/tentacled/',
+		parameters => $service_params
+	);
+	
+	if (Win32::Daemon::CreateService(\%service_hash)) {
+		print "Successfully added.\n";
+		exit 0;
+	} else {
+		print "Failed to add service: " . Win32::FormatMessage(Win32::Daemon::GetLastError()) . "\n";
+		exit 1;
+	}
+}
+
+################################################################################
+## SUB uninstall_service
+## Install the Windows service.
+################################################################################
+sub uninstall_service() {
+	if (Win32::Daemon::DeleteService('', 'TENTACLESRV')) {
+		print "Successfully deleted.\n";
+		exit 0;
+	} else {
+		print "Failed to delete service: " . Win32::FormatMessage(Win32::Daemon::GetLastError()) . "\n";
+		exit 1;
+	}
+}
+
+################################################################################
+## SUB callback_running
+## Windows service callback function for the running event.
+################################################################################
+sub callback_running {
+
+	if (Win32::Daemon::State() == WIN32_SERVICE_RUNNING) {
+	}
+}
+
+################################################################################
+## SUB callback_start
+## Windows service callback function for the start event.
+################################################################################
+sub callback_start {
+
+	# Accept_connections ();
+	my $thr = threads->create(\&accept_connections);
+	if (!defined($thr)) {
+		Win32::Daemon::State(WIN32_SERVICE_STOPPED);
+		Win32::Daemon::StopService();
+		return;
+	}
+	$thr->detach();
+
+	Win32::Daemon::State(WIN32_SERVICE_RUNNING);
+}
+
+################################################################################
+## SUB callback_stop
+## Windows service callback function for the stop event.
+################################################################################
+sub callback_stop {
+
+	foreach my $t_server_socket (@t_server_sockets) {
+		$t_server_socket->shutdown (2);
+		$t_server_socket->close ();
+	}
+
+	Win32::Daemon::State(WIN32_SERVICE_STOPPED);
+	Win32::Daemon::StopService();
+}
+
+################################################################################
+# Main
+################################################################################
+
+# Never run as root
+if ($> == 0 && $^O ne 'MSWin32') {
+	print ("Error: for safety reasons $0 cannot be run with root privileges.\n");
+	exit 1;
+}
+
+# Parse command line options
+parse_options ();
+
+# Check command line arguments
+if ($#ARGV != -1) {
+	print_help ();
+	exit 1;
+}
+
+# Show IPv6 status
+if ($SOCKET_MODULE eq 'IO::Socket::INET') {
+	print_log ("IO::Socket::INET6 is not found. IPv6 is disabled.");
+}
+
+# Run as daemon?
+if ($t_daemon == 1 && $^O ne 'MSWin32') {
+	daemonize ();
+}
+
+# Handle ctr-c
+if ($^O eq 'MSWin32') {
+	no warnings;
+	$SIG{INT2} = \&stop_server;
+	use warnings;
+}
+else {
+	$SIG{INT} = \&stop_server;
+}
+
+# Accept connections
+accept_connections();
+
+__END__
+
+=head1 REQUIRED ARGUMENTES
+
+=over 
+
+=item B<< -s F<storage_directory> >>	Root directory to store the files received by the server
+
+=back 
+
+=head1 OPTIONS
+
+=over
+
+=item 	I<-a ip_address>	Address to B<listen> on (default I<0.0.0.0>).
+
+=item	I<-c number>		B<Maximum> number of simultaneous B<connections> (default I<10>).
+
+=item	I<-d>			Run as B<daemon>.
+
+=item	I<-e cert>		B<OpenSSL certificate> file. Enables SSL.
+
+=item	I<-f ca_cert>	Verify that the peer certificate is signed by a B<CA>.
+
+=item	I<-h>			Show B<help>.
+
+=item	I<-i>			B<Filters>.
+
+=item	I<-k key>		B<OpenSSL private key> file.
+
+=item	I<-m size>		B<Maximum file size> in bytes (default I<2000000b>).
+
+=item	I<-o>			Enable file B<overwrite>.
+
+=item	I<-p port>		B<Port to listen> on (default I<41121>).
+
+=item	I<-q>			B<Quiet>. Do now print error messages.
+
+=item	I<-r number>		B<Number of retries> for network opertions (default I<3>).
+
+=item	I<-t time>		B<Time-out> for network operations in B<seconds> (default I<1s>).
+
+=item	I<-v>			Be B<verbose>.
+
+=item	I<-w>			Prompt for B<OpenSSL private key password>.
+
+=item	I<-x> pwd		B<Server password>.
+
+=back
+
+=head1 EXIT STATUS
+
+=over 
+
+=item 0 on Success
+
+=item 1 on Error
+
+=back 
+
+=head1 CONFIGURATION
+
+Tentacle doesn't use any configurationf files, all the configuration is done by the options passed when it's started.
+
+=head1 DEPENDENCIES
+
+L<Getopt::Std>, L<IO::Select>, L<IO::Socket::INET>, L<Thread::Semaphore>, L<POSIX> 
+
+
+=head1 LICENSE
+
+This is released under the GNU Lesser General Public License.
+
+=head1 SEE ALSO
+
+L<Getopt::Std>, L<IO::Select>, L<IO::Socket::INET>, L<Thread::Semaphore>, L<POSIX> 
+
+Protocol description and more info at: L<< https://pandorafms.com/docs/index.php?title=Pandora:Documentation_en:Tentacle >>
+
+=head1 COPYRIGHT
+
+Copyright (c) 2005-2010 Artica Soluciones Tecnologicas S.L
+
+=cut
+ 
diff --git a/tentacle/build_tentacle_server.sh b/tentacle/build_tentacle_server.sh
new file mode 100755
index 0000000000..9f833edc99
--- /dev/null
+++ b/tentacle/build_tentacle_server.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+CODEHOME=$HOME/code/pandorafms
+
+# Add build string for nightly builds
+if [ "$1" == "nightly" ]; then
+	LOCAL_VERSION="$VERSION-$BUILD"
+else
+	LOCAL_VERSION=$1
+fi
+
+if [ ! -d $CODEHOME/tentacle/dist ]; then
+	mkdir -p $CODEHOME/tentacle/dist || exit 1
+fi
+
+echo "Creating source tarballs in $(pwd)/dist"
+
+# Server
+cd $CODEHOME && tar zcvf $CODEHOME/tentacle/dist/tentacle_server-$LOCAL_VERSION.tar.gz \
+--exclude \.svn \
+--exclude \.exe \
+--exclude dist \
+--exclude build_tentacle_server.sh \
+tentacle || exit 1
+
+exit 0
\ No newline at end of file
diff --git a/tentacle/conf/tentacle_server.conf.new b/tentacle/conf/tentacle_server.conf.new
new file mode 100644
index 0000000000..1acf082ca2
--- /dev/null
+++ b/tentacle/conf/tentacle_server.conf.new
@@ -0,0 +1,75 @@
+##########################################################################
+# Tentacle Server Parameters
+# See https://pandorafms.com/manual/en/documentation/08_technical_reference/09_tentacle
+# for protocol description.
+# Tentacle have IANA assigned port tpc/41121 as official port.
+##########################################################################
+
+# [-a] IPv4 address to listen on. Several IPs cam be selected separating if by comma.
+addresses 0.0.0.0
+
+# [-p] Port to listen on
+port 41121
+
+# [-c] Maximum number of simultaneous connections
+# max_connections 10
+
+# [-d] Run as daemon. 1 true, 0 false
+daemon 1
+
+# [-i] Enable insecure mode
+# insecure 0
+
+# Filters (regexp:dir;regexp:dir...)
+filters .*\.conf:conf;.*\.md5:md5;.*\.zip:collections;.*\.lock:trans;.*\.rcmd:commands
+
+# [-m] Maximum file size allowed by the server in bytes
+#max_size 2000000
+
+# [-o] Accept files with a repeated name
+# overwrite 0
+
+# [-q] Do not output error messages.
+# quiet 0
+
+# [-r] Number of retries for socket read/write operations
+# retries 3
+
+# [-s] Storage directory
+directory /var/spool/pandora/data_in
+
+# [-b] Address to proxy client requests to
+# proxy_ip 127.0.0.1
+
+# [-g] Port to proxy client requests to
+# proxy_port 41121
+
+# [-t] Timeout for socket read/write operations in seconds
+# timeout 1
+
+# [-v and -V] Verbose level
+#   0: Do not display any informative messages
+#   1: Display only important messages [-v]
+#   2: Display all messages [-V]
+# verbose 0
+
+# [-l] Log file
+log_file /dev/null
+
+# [-x] Server password
+# password PASSWORD
+
+# [-e] SSL certificate file full path
+# ssl_cert /path/to/ssl/cert
+
+# [-f] SSL CA file full path
+# ssl_ca /path/to/ssl/ca
+
+# [-k] SSL private key file
+# ssl_key /path/to/private/key/file
+
+# [-w] SSL password. Set to 1 to ask for password by command line
+# ssl_password 0
+
+# [-T] Use libwrap library (Authen::Libwrap perl module)
+# use_libwrap 0
\ No newline at end of file
diff --git a/tentacle/man/man1/tentacle_server.1.gz b/tentacle/man/man1/tentacle_server.1.gz
new file mode 100644
index 0000000000..eea67284be
Binary files /dev/null and b/tentacle/man/man1/tentacle_server.1.gz differ
diff --git a/tentacle/tentacle_server_installer b/tentacle/tentacle_server_installer
new file mode 100755
index 0000000000..176a4743e5
--- /dev/null
+++ b/tentacle/tentacle_server_installer
@@ -0,0 +1,404 @@
+#!/bin/sh
+
+# Tentacle Server Installer
+# Linux/FreeBSD Version (generic), for SuSe, Debian/Ubuntu and FreeBSD only
+# other Linux distros could not work properly without modifications
+# Please see http://www.pandorafms.org
+# v1.0 Build 13062022
+# This code is licensed under GPL 2.0 license.
+# **********************************************************************
+
+PI_VERSION="7.0NG.762"
+PI_BUILD="220613"
+
+MODE=$1
+if [ $# -gt 1 ]; then
+	shift
+fi
+
+# Defaults
+PREFIX=/usr
+PANDORA_SPOOL=/var/spool/pandora
+TENTACLE_SERVER=/etc/init.d/tentacle_serverd
+TENTACLE_CFG_DIR=/etc/tentacle
+TENTACLE_CFG_FILE=$TENTACLE_CFG_DIR/tentacle_server.conf
+TENTACLE_CFG_FILE_DIST=conf/tentacle_server.conf.new
+TENTACLE_INIT_SCRIPT=util/tentacle_serverd
+PERL=perl
+MANDIR=$PREFIX/share/man/man1
+INITDIR=/etc/init.d
+WITHOUT_TENTACLE=0
+
+#
+# set_global_vars
+#	Check platform and set DISTRO, OS_VERSION and LINUX.
+#	Also, define some platform sepcific variables (e.g. PANDORA_RC_VAR for (Free|Net)BSD) 
+#	and override some of defaults defined above if needed.
+#
+set_global_vars () {
+	# Default
+	LINUX=NO
+	OS_VERSION=`uname -r`
+	DISTRO=`uname -s`
+
+	# set correct value for LINUX_DISTRO
+	case $DISTRO in
+	Linux)
+		# Default for Linux
+		LINUX=YES
+		DISTRO="GENERIC"
+		# Get Linux Distro type and version
+		# We assume we are on Linux unless told otherwise
+		if [ -f "/etc/SuSE-release" ]
+		then
+			OS_VERSION=`cat /etc/SuSE-release | grep VERSION | cut -f 3 -d " "`
+			DISTRO=SUSE
+		elif [ -f "/etc/lsb-release" ] && [ ! -f "/etc/redhat-release" ]
+		then
+			OS_VERSION=`cat /etc/lsb-release | grep DISTRIB_RELEASE | cut -f 2 -d "="`
+			DISTRO=UBUNTU
+			OS_VERSION="UBUNTU $OS_VERSION"
+		elif [ -f "/etc/debian_version" ]
+		then
+			OS_VERSION=`cat /etc/debian_version`
+			OS_VERSION="DEBIAN $OS_VERSION"
+			DISTRO=DEBIAN
+		elif [ -f "/etc/fedora-release" ]
+		then
+			OS_VERSION=`cat /etc/fedora-release | cut -f 4 -d " "`
+			OS_VERSION="FEDORA $OS_VERSION"
+			DISTRO=FEDORA
+		fi
+		;;
+	Darwin|AIX)
+		# For future reference, Darwin doesn't have /etc/init.d but uses LaunchDaemons.
+		# AIX doesn't have /etc/init.d
+		;;
+	SunOS)
+		# Some Solaris and other Unices don't have /etc/init.d, some have /usr/spool instead of /var/spool
+		DISTRO="Solaris"
+		;;
+	FreeBSD)
+		PREFIX=/usr/local
+		TENTACLE_SERVER=$PREFIX/etc/rc.d/tentacle_server
+		TENTACLE_CFG_DIR=$PREFIX/etc/tentacle
+		TENTACLE_CFG_FILE=$TENTACLE_CFG_DIR/tentacle_server.conf
+		TENTACLE_INIT_SCRIPT=$DISTRO/tentacle_server
+		MANDIR=$PREFIX/man/man1
+		INITDIR=$PREFIX/etc/rc.d
+		PERL=/usr/local/bin/perl
+		TENTACLE_RC_VAR="tentacle_server_enable"
+		;;
+	NetBSD)
+		PREFIX=/usr/local
+		TENTACLE_CFG_DIR=$PREFIX/etc/tentacle
+		TENTACLE_CFG_FILE=$TENTACLE_CFG_DIR/tentacle_server.conf
+		TENTACLE_SERVER=/etc/rc.d/tentacle_server
+		TENTACLE_INIT_SCRIPT=$DISTRO/tentacle_server
+		PERL=/usr/pkg/bin/perl
+		INITDIR=/etc/rc.d
+		PANDORA_RC_VAR="pandora_server"
+		TENTACLE_RC_VAR="tentacle_server"
+		;;
+	esac
+}
+
+#
+# install_startup_script [options...] SRC
+#	copy SRC into the $INITDIR and do additional required operation according to $DISTRO
+#	if $INITDIR is not set or empty, do nothing.
+#	If $DESTDIR is set, skip enabling service
+#	OPTIONS:
+#		-s SPRIO  specify startup priority for service
+#
+install_startup_script () {
+	[ "$INITDIR" ] || return 1
+	if [ "$1" = "-s" ]
+	then
+		SPRIO=$2
+		shift;shift
+	fi
+	SRC=$1
+	SCRIPT_NAME=`basename $SRC`
+
+	echo "Copying the daemon script into $DESTDIR$INITDIR"
+	[ -d $DESTDIR$INITDIR ] || mkdir -p $DESTDIR$INITDIR
+	cp $SRC $DESTDIR$INITDIR
+
+	[ "$DESTDIR" ] && return
+
+	case $DISTRO in
+	UBUNTU|DEBIAN)
+		echo "Linking startup script to /etc/rc2.d"
+		update-rc.d $SCRIPT_NAME defaults
+		;;
+	SUSE)
+		echo "Creating startup daemons"
+		insserv $SCRIPT_NAME
+		;;
+	FeeBSD|NetBSD)
+		chmod 555 $DESTDIR$INITDIR/$SCRIPT_NAME
+		;;
+	*)
+		if [ "$LINUX" = YES ]
+		then
+			# Pandora FMS Server install (Other Distros)
+			INITLV=`grep '[0-9]:initdefault' /etc/inittab | cut -f 2 -d ':'`
+			: ${INITLV:=2}
+			echo "Linking startup script to /etc/rc.d/rc$INITLV.d/S$SPRIO$SCRIPT_NAME"
+			ln -s $INITDIR/$SCRIPT_NAME /etc/rc.d/rc$INITLV.d/S$SPRIO$SCRIPT_NAME
+		fi
+		;;
+	esac
+}
+
+install () {
+	set_global_vars
+
+	FORCE=0
+
+	# parse options
+	while :
+	do
+		case $1 in
+		--force) FORCE=1;;
+		--destdir) DESTDIR=$2;shift;;
+		*) break;;
+		esac
+		shift
+	done
+	
+	if [ "$LINUX" = YES ]
+	then
+		echo "$DISTRO distribution detected"
+	else 
+		echo "$DISTRO detected"
+	fi
+	
+	$PERL -v &> /dev/null
+	if [ $? != 0 ]; then
+		echo ' '
+		echo 'Error, no PERL Interpeter found, please install perl on your system'
+		exit 1
+	fi
+
+	#Check dependenciaes.
+	if [ $FORCE -eq 0 ]; then
+		# Execute tools check
+		execute_cmd "ps --version" 'Checking dependencies: ps' "Error ps not found, please install procps"
+		execute_cmd "sudo --version" 'Checking dependencies: sudo' "Error sudo not found, please install sudo"
+		execute_cmd "perl -MIO::Compress::Zip -le 'pass'" 'Checking dependencies: perl IO::Compress' "Error perl IO::Compress not found, please install perl IO::Compress"
+	fi
+
+	# install tentacle
+	[ -d $DESTDIR$PREFIX/bin/ ] || mkdir -p $DESTDIR$PREFIX/bin/
+	echo ">Installing the tentacle_server binary to $DESTDIR$PREFIX/bin/..."
+	cp -f tentacle_server "$DESTDIR$PREFIX/bin/"
+
+	echo ">Installing the tentacle_client binary to $DESTDIR$PREFIX/bin/..."
+	cp -f tentacle_client "$DESTDIR$PREFIX/bin/"
+
+	echo "Creating common Pandora FMS directories"
+	id pandora 2> /dev/null
+	if [ $? -eq 0 ]; then
+		echo " "
+		echo "User pandora does exist, make sure the SSH directories are correct"
+	else
+		echo "Are you sure we can create a standard 'pandora' user locally? [y/N]"
+		read AREYOUSURE
+		if [ "$AREYOUSURE" = "y" ]; then
+			if [ "$DISTRO" = "FreeBSD" ]
+			then
+				echo "pandora:41121:::::Pandora FMS:/home/pandora:/usr/sbin/nologin:" | adduser -f - -w no 2> /dev/null
+			else
+				useradd pandora 
+				mkdir /home/pandora 2> /dev/null
+				mkdir /home/pandora/.ssh 2> /dev/null
+				chown -R pandora /home/pandora 
+			fi
+		else
+			echo "Please create the 'pandora' user manually according to your authentication scheme, then start again the installation"
+			echo "Aborting..."
+			exit 1
+		fi
+	fi
+
+	mkdir -p $DESTDIR$PANDORA_SPOOL/data_in 2> /dev/null
+	chmod 2770 $DESTDIR$PANDORA_SPOOL/data_in
+	mkdir $DESTDIR$PANDORA_SPOOL/data_in/conf 2> /dev/null
+	chmod 2770 $DESTDIR$PANDORA_SPOOL/data_in/conf
+	mkdir $DESTDIR$PANDORA_SPOOL/data_in/md5 2> /dev/null
+	chmod 2770 $DESTDIR$PANDORA_SPOOL/data_in/md5
+	mkdir $DESTDIR$PANDORA_SPOOL/data_in/collections 2> /dev/null
+	chmod 2770 $DESTDIR$PANDORA_SPOOL/data_in/collections
+	mkdir $DESTDIR$PANDORA_SPOOL/data_in/netflow 2> /dev/null
+	chmod 2770 $DESTDIR$PANDORA_SPOOL/data_in/netflow
+	mkdir $DESTDIR$PANDORA_SPOOL/data_in/trans 2> /dev/null
+	chmod 2770 $DESTDIR$PANDORA_SPOOL/data_in/trans
+	mkdir $DESTDIR$PANDORA_SPOOL/data_in/commands 2> /dev/null
+	chmod 2770 $DESTDIR$PANDORA_SPOOL/data_in/commands
+
+
+	echo "Giving proper permission to $DESTDIR$PANDORA_SPOOL/"
+	for group in "www-data" wwwrun www apache
+	do
+		IDGROUP=`id -g "$group" 2> /dev/null`
+		if [ $? -eq 0 ]
+		then
+			GROUPNAME=`grep ":$IDGROUP:" /etc/group | awk -F":" '{print $1}'`
+			break
+		fi
+	done
+	if [ -z "$GROUPNAME" ]
+	then
+		echo "No web server user found, some functionality might not perform correctly"
+		GROUPNAME=0
+	fi
+	# when fakeroot installation, this can fail
+	chown -R pandora:$GROUPNAME $DESTDIR$PANDORA_SPOOL 2>/dev/null
+
+	chown apache:$GROUPNAME $DESTDIR$PANDORA_SPOOL/data_in/customer_key 2>/dev/null
+	
+	# install tentacle_server
+	install_startup_script -s 80 $TENTACLE_INIT_SCRIPT
+
+	# Create the directory to locate the Tentacle configuration file
+	echo "Creating setup Tentacle directory in $DESTDIR$TENTACLE_CFG_DIR"
+	mkdir -p $DESTDIR$TENTACLE_CFG_DIR 2> /dev/null
+	if [ -f "$DESTDIR$TENTACLE_CFG_FILE" ]
+	then
+		echo cp $TENTACLE_CFG_FILE_DIST $DESTDIR$TENTACLE_CFG_DIR
+		cp $TENTACLE_CFG_FILE_DIST $DESTDIR$TENTACLE_CFG_DIR
+	else
+		echo cp $TENTACLE_CFG_FILE_DIST $DESTDIR$TENTACLE_CFG_FILE
+		cp $TENTACLE_CFG_FILE_DIST $DESTDIR$TENTACLE_CFG_FILE
+		chmod 774 $DESTDIR$TENTACLE_CFG_FILE
+	fi
+	
+	echo "Installing Tentacle Server manual"
+	[ -d $DESTDIR$MANDIR ] || mkdir -p $DESTDIR$MANDIR
+	cp man/man1/tentacle_server.1.gz $DESTDIR$MANDIR
+
+	# Fix util paths
+	sed -i -e "s|directory.*|directory $DESTDIR$PANDORA_SPOOL/data_in|g" $DESTDIR$TENTACLE_CFG_FILE 
+	sed -i -e "s|TENTACLE_PATH=\"/usr/bin\"|TENTACLE_PATH=$DESTDIR$PREFIX/bin|g" $DESTDIR$TENTACLE_SERVER
+	sed -i -e "s|^TENTACLE_CONFIG_FILE=.*|TENTACLE_CONFIG_FILE=$DESTDIR$TENTACLE_CFG_FILE|g" $DESTDIR$TENTACLE_SERVER
+
+	echo "Tentacle Server installed"
+
+
+}
+
+uninstall () {
+	set_global_vars
+
+	# parse options
+	while :
+	do
+		case $1 in
+		--destdir) DESTDIR=$2;shift;;
+		*) break;;
+		esac
+		shift
+	done
+
+	if [ "$LINUX" != "YES" ] && [ "$DISTRO" != "FreeBSD" ] && [ "$DISTRO" != "NetBSD" ]
+	then
+		echo "This is not a Linux-based distro. Uninstaller is currently not working for your OS"
+		exit 1
+	fi
+
+
+	echo "Removing Tentacle Server"
+	if [ -d $DESTDIR$PANDORA_SPOOL/data_out ]; then
+		rm -Rf $DESTDIR$PANDORA_SPOOL/data_in
+	else
+		rm -Rf $DESTDIR$PANDORA_SPOOL
+	fi
+
+	echo "If the user Pandora is not being used for any other operations, please delete using the following commands:"
+	if [ "$DISTRO" != "FreeBSD" ] || [ "$DISTRO" != "NetBSD" ]
+	then
+		echo "  rmuser pandora"
+	else
+		echo "	userdel pandora"
+		echo "	rm -Rf /home/pandora/"
+	fi
+
+	## Just to clarify here. Some people (like me) are using the pandora user 
+	## for other purposes and/or using an LDAP-based user management
+	## I would hate to have a script clear out this users' information without any notification
+
+
+	rm -f  $DESTDIR$TENTACLE_CFG_FILE 2> /dev/null
+	rm -f  "$DESTDIR$TENTACLE_CFG_FILE.new" 2> /dev/null
+	# Do not remove tentacle files if agent is still installed...
+	[ -e $DESTDIR$PREFIX/bin/pandora_agent ] || rm -f  $DESTDIR$PREFIX/bin/tentacle_server 2> /dev/null
+	[ -e $DESTDIR$PREFIX/bin/pandora_agent ] || rm -f  $DESTDIR$PREFIX/bin/tentacle_client 2> /dev/null
+	if [ "$DESTDIR" ]
+	then
+		rm -f $DESTDIR$TENTACLE_SERVER
+	elif [ "$DISTRO" = "UBUNTU" ] || [ "$DISTRO" = "DEBIAN" ]
+	then
+		update-rc.d -f tentacle_serverd remove
+	fi
+
+	rm -f $DESTDIR/etc/rc2.d/S80tentacle_serverd 2> /dev/null 
+	rm -f $DESTDIR/etc/rc.d/rc3.d/S80tentacle_serverd 2> /dev/null 
+
+	echo "Done"
+	echo $DESTDIR$TENTACLE_SERVER
+}
+
+help () {
+	echo "  --install	To install Pandora FMS Servers on this system (You have to be root)"
+	echo "  --uninstall	To uninstall and remove Pandora FMS Servers on this System"
+	echo " "
+	echo " Additional second parameter (after --install) "
+	echo " "
+	echo "  --force			Ignore dependency problems and do the install"
+	echo "  --destdir DIR	Specify root directory for \"fakeroot\" installation"
+	echo " "
+}
+
+execute_cmd () {
+    cmd="$1"
+    msg="$2"
+
+    echo "$msg"
+    $cmd &>> /dev/null
+    if [ $? -ne 0 ]; then
+        echo "Fail"
+        [ "$3" ] && echo "$3"
+        echo "Error installing Tentacle server"
+        exit 1
+    else
+        echo "Ok"
+        return 0
+    fi
+}
+
+##Main
+
+# Script banner at start
+echo " "
+echo "Tentacle Server Installer $PI_VERSION $PI_BUILD (c) 2008-2022 Artica ST"
+echo "This program is licensed under GPL2 Terms. http://pandorafms.com"
+echo " "
+
+case "$MODE" in
+
+'--install')
+	install "$@"
+	exit 0
+	;;
+
+'--uninstall')
+	uninstall "$@"
+	exit 0
+	;;
+
+*)
+	help
+esac
+
diff --git a/tentacle/util/tentacle_serverd b/tentacle/util/tentacle_serverd
new file mode 100755
index 0000000000..0c0f35ff97
--- /dev/null
+++ b/tentacle/util/tentacle_serverd
@@ -0,0 +1,185 @@
+#!/bin/bash
+# Copyright (c) 2005-2010 Artica ST
+#
+# Author: Sancho Lerena <slerena@artica.es> 2006-2010
+#
+# /etc/init.d/tentacle_server
+#
+# System startup script for Tentacle Server
+#
+# Comments to support chkconfig on RedHat Linux
+# chkconfig: 2345 90 90
+# description: Tentacle Server startup script
+#
+# Comments to support LSB init script conventions
+### BEGIN INIT INFO
+# Provides:       tentacle_server
+# Required-Start: $network
+# Should-Start:   $syslog
+# Required-Stop:  $network
+# Should-Stop:    $network
+# Default-Start:  2 3 5
+# Default-Stop:   0 1 6
+# Short-Description: Tentacle Server startup script
+# Description:    Tentacle Server startup script
+### END INIT INFO
+
+if [ -x /lib/lsb/init-functions ]; then
+. /lib/lsb/init-functions
+fi
+
+# Uses a wait limit before sending a KILL signal, before trying to stop
+# Pandora FMS server nicely. Some big systems need some time before close
+# all pending tasks / threads.
+
+export MAXWAIT=60
+
+# Check for SUSE status scripts
+if [ -f /etc/rc.status ]
+then
+	. /etc/rc.status
+	rc_reset
+else
+	# Define part of rc functions for non-suse systems
+	function rc_status () {
+		RETVAL=$?
+		case $1 in
+			-v) RETVAL=0;;
+		esac
+	}
+	function rc_exit () { exit $RETVAL; }
+	function rc_failed () { RETVAL=${1:-1}; }
+	RETVAL=0
+fi
+
+function get_pid {
+	# This sets COLUMNS to XXX chars, because if command is run 
+	# in a "strech" term, ps aux don't report more than COLUMNS
+	# characters and this will not work. 
+	COLUMNS=300
+	TENTACLE_PID=`ps -Af | grep "$TENTACLE_PATH$TENTACLE_DAEMON" | grep "$TENTACLE_CONFIG_FILE" | grep -v grep | tail -1 | awk '{ print $2 }'`
+	echo $TENTACLE_PID
+}
+
+function get_all_pid {
+	# This sets COLUMNS to XXX chars, because if command is run 
+	# in a "strech" term, ps aux don't report more than COLUMNS
+	# characters and this will not work. 
+	COLUMNS=300
+	TENTACLE_PIDS=`ps aux | grep "$TENTACLE_PATH$TENTACLE_DAEMON" | grep -v grep | awk '{ print $2 }'`
+	TENTACLE_PID="${TENTACLE_PIDS//\\n/' '}"
+	echo $TENTACLE_PID
+}
+
+# Tentacle server settings
+TENTACLE_DAEMON="tentacle_server"
+TENTACLE_PATH="/usr/bin"
+TENTACLE_USER="pandora"
+TENTACLE_CONFIG_FILE="/etc/tentacle/tentacle_server.conf"
+TENTACLE_EXT_OPTS=""
+
+# Set umask to 0002, because group MUST have access to write files to
+# use remote file management on Pandora FMS Enterprise.
+
+umask 0007
+
+# Main script
+TENTACLE_OPTS="-F $TENTACLE_CONFIG_FILE $TENTACLE_EXT_OPTS"
+
+# Fix TENTACLE_PATH
+case "$TENTACLE_PATH" in
+	*\/)
+	;;
+	*)
+		TENTACLE_PATH="${TENTACLE_PATH}/"
+	;;
+esac
+
+if [ ! -f "${TENTACLE_PATH}$TENTACLE_DAEMON" ]; then
+	echo "Tentacle Server not found in ${TENTACLE_PATH}$TENTACLE_DAEMON"
+	rc_failed 5 # program is not installed
+	rc_exit
+fi
+
+case "$1" in
+	start)
+		TENTACLE_PID=`get_pid`
+		if [ ! -z "$TENTACLE_PID" ]; then
+			echo "Tentacle Server is already running with PID $TENTACLE_PID"
+			rc_exit	# running start on a service already running
+		fi
+
+		# Init the tentacle process
+		sudo -u $TENTACLE_USER ${TENTACLE_PATH}$TENTACLE_DAEMON $TENTACLE_OPTS
+		sleep 1
+
+		TENTACLE_PID=`get_pid`
+		if [ ! -z "$TENTACLE_PID" ]; then
+			echo "Tentacle Server is now running with PID $TENTACLE_PID"
+			rc_status -v
+		else
+			echo "Tentacle Server could not be started."
+			echo "Verify that Tentacle port is not used."
+			rc_failed 7 # program not running
+		fi
+
+	;;
+	
+	stop)
+		TENTACLE_PID=`get_all_pid`
+		if [ -z "$TENTACLE_PID" ]; then
+			echo "Tentacle Server does not seem to be running"
+			rc_exit # running stop on a service already stopped or not running
+		else
+			kill $TENTACLE_PID
+			
+			COUNTER=0
+			while [ $COUNTER -lt $MAXWAIT ]
+	 		do
+ 				_PID=`get_all_pid`
+				if [ "$_PID" != "$TENTACLE_PID" ]
+					# tentacle already stopped
+ 				then
+					COUNTER=$MAXWAIT
+				fi
+				COUNTER=`expr $COUNTER + 1`
+				sleep 1
+			done
+
+			if [ "$_PID" = "$TENTACLE_PID" ]
+			then
+				kill -9 $TENTACLE_PID   > /dev/null 2>&1
+			fi
+			
+			echo "Stopping Tentacle Server"
+			rc_status -v
+		fi
+
+	;;
+
+	force-reload|restart)
+		$0 stop
+		sleep 1
+		$0 start
+		rc_status
+	;;
+
+	status)
+		TENTACLE_PID=`get_pid`
+		if [ -z "$TENTACLE_PID" ]; then
+			echo "Tentacle Server is not running."
+			rc_failed 7 # program is not running
+		else
+			echo "Tentacle Server is running with PID $TENTACLE_PID."
+			rc_status 
+		fi
+		
+	;;
+
+	*)
+		echo "Usage: $0  {start | stop | restart | status}"
+		exit 1
+	;;
+esac
+
+rc_exit
diff --git a/tentacle/util/tentacle_serverd.service b/tentacle/util/tentacle_serverd.service
new file mode 100644
index 0000000000..fb6d2af2e3
--- /dev/null
+++ b/tentacle/util/tentacle_serverd.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Tentacle server daemon
+After=network-online.target
+Requires=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/tentacle_server -F /etc/tentacle/tentacle_server.conf
+User=pandora
+Restart=on-failure
+RestartPreventExitStatus=1
+
+[Install]
+WantedBy=multi-user.target