diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index f17d570a6c..bfaa1c6535 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.773-230818
+Version: 7.0NG.773-230821
 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 16aaa10b94..31898d3bff 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.773-230818"
+pandora_version="7.0NG.773-230821"
 
 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 c483c5c520..db5d63412b 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1031,7 +1031,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.773';
-use constant AGENT_BUILD => '230818';
+use constant AGENT_BUILD => '230821';
 
 # 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 09373ccd6a..4b8b28c516 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.773
-%define release     230818
+%define release     230821
 
 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 8f11d86e8f..fdc649bc7d 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.773
-%define release     230818
+%define release     230821
 
 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 9a94c71af8..bad3cc6f6c 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.773"
-PI_BUILD="230818"
+PI_BUILD="230821"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index cc5e35d96a..5e109876ed 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{230818}
+{230821}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index e7b6da426a..4bca7701cd 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.773 Build 230818")
+#define PANDORA_VERSION ("7.0NG.773 Build 230821")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 0aef51fc85..60e8056dd3 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Pandora FMS"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.773(Build 230818))"
+      VALUE "ProductVersion", "(7.0NG.773(Build 230821))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 1919e28549..93cb275ead 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.773-230818
+Version: 7.0NG.773-230821
 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 03584ae454..681eff9b86 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.773-230818"
+pandora_version="7.0NG.773-230821"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/extras/mr/66.sql b/pandora_console/extras/mr/66.sql
index a9e063130d..c589566c73 100644
--- a/pandora_console/extras/mr/66.sql
+++ b/pandora_console/extras/mr/66.sql
@@ -37,4 +37,13 @@ SET @event_response_display_command = 1;
 UPDATE `tevent_response` SET `name` = @event_response_name, `description` = @event_response_description, `target` = @event_response_target, `display_command` = @event_response_display_command WHERE `name` = 'Create ticket in IntegriaIMS from event';
 INSERT IGNORE INTO `tevent_response` (`name`, `description`, `target`,`type`,`id_group`,`modal_width`,`modal_height`,`new_window`,`params`,`server_to_exec`,`command_timeout`,`display_command`) VALUES (@event_response_name, @event_response_description, @event_response_target, @event_response_type, @event_response_id_group, @event_response_modal_width, @event_response_modal_height, @event_response_new_window, @event_response_params, @event_response_server_to_exec, @event_response_command_timeout, @event_response_display_command);
 
-COMMIT;
\ No newline at end of file
+UPDATE `twelcome_tip`
+	SET title = 'Scheduled downtimes',
+         url = 'https://pandorafms.com/manual/en/documentation/04_using/11_managing_and_administration#scheduled_downtimes'
+	WHERE title = 'planned stops';
+
+UPDATE tagente_modulo SET `tcp_send` = '2c' WHERE `tcp_send` = '2';
+UPDATE tpolicy_modules SET `tcp_send` = '2c' WHERE `tcp_send` = '2';
+UPDATE tnetwork_component SET `tcp_send` = '2c' WHERE `tcp_send` = '2';
+
+COMMIT;
diff --git a/pandora_console/general/admin_maintenance_mode.php b/pandora_console/general/admin_maintenance_mode.php
new file mode 100644
index 0000000000..eda793120f
--- /dev/null
+++ b/pandora_console/general/admin_maintenance_mode.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Static page to lock access to console
+ *
+ * @category   Wizard
+ * @package    Pandora FMS
+ * @subpackage Applications.VMware
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * 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 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.
+ * ============================================================================
+ */
+
+// Begin.
+ui_require_css_file('maintenance');
+?>
+<html>
+<body>
+
+    <div class="responsive center padding-6">
+        <p>
+            <?php
+            if (is_metaconsole() === true) {
+                echo __('You cannot use this metaconsole until merging process is finished');
+            } else {
+                echo __('You cannot use this console until merging process is finished');
+            }
+            ?>
+        </p>
+        <br>
+        <br>
+
+        <?php
+        html_print_image(
+            'images/pandora_tinylogo.png',
+            false,
+            ['class' => 'responsive flex margn']
+        );
+        html_print_image(
+            'images/maintenance.png',
+            false,
+            [
+                'class' => 'responsive',
+                'width' => 800,
+            ]
+        );
+        ?>
+
+        <br>
+        <br>
+        <p><?php echo __('You will be automatically redirected when all tasks finish'); ?></p>
+    </div>
+</body>
+
+<script type="text/javascript">
+    $(document).ready(function() {
+        setTimeout(
+            function() {
+                location.reload();
+            },
+            10000
+        );
+    })
+</script>
+
+</html>
\ No newline at end of file
diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index d3d9c7e686..e18d278ac8 100755
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -30,7 +30,7 @@ require_once __DIR__.'/../include/functions_html.php';
 echo '<style>
         :root {';
 if ($config['style'] === 'pandora') {
-    echo '--login-background-color: rgba(255, 255, 255, 0.4);';
+    echo '--login-background-color: rgba(255, 255, 255, 0.50);';
     echo '--login-label-color: #545454;';
     echo '--login-text-color: #000;';
     $style_theme = 'white-theme';
@@ -237,16 +237,18 @@ if (is_metaconsole() === true) {
         );
     }
 } else if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
+    $theme_logo = ($config['style'] === 'pandora') ? 'images/custom_logo_login/Pandora FMS alt black.png' : 'enterprise/images/custom_logo_login/'.$config['custom_logo_login'];
     if (!isset($config['custom_logo_login'])) {
-        html_print_image(ui_get_full_url('enterprise/images/custom_logo_login/Pandora-FMS-1.png'), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
+        html_print_image(ui_get_full_url($theme_logo), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
     } else {
-        html_print_image(ui_get_full_url('enterprise/images/custom_logo_login/'.$config['custom_logo_login']), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
+        html_print_image(ui_get_full_url($theme_logo), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
     }
 } else {
+    $theme_logo = ($config['style'] === 'pandora') ? 'images/custom_logo_login/Pandora FMS alt black.png' : 'images/custom_logo_login/'.$config['custom_logo_login'];
     if (empty($config['custom_logo_login']) === true) {
-        html_print_image(ui_get_full_url('images/custom_logo_login/Pandora-FMS-1.png'), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
+        html_print_image(ui_get_full_url($theme_logo), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
     } else {
-        html_print_image(ui_get_full_url('images/custom_logo_login/').$config['custom_logo_login'], false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
+        html_print_image(ui_get_full_url($theme_logo), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
     }
 }
 
diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php
index cf5379bf91..6567347999 100644
--- a/pandora_console/general/logon_ok.php
+++ b/pandora_console/general/logon_ok.php
@@ -259,6 +259,8 @@ if (!empty($news)) {
 
             $output_news .= '</div></div>';
         } else {
+            $text = str_replace('<script', '&lt;script', $text);
+            $text = str_replace('</script', '&lt;/script', $text);
             $output_news .= nl2br($text);
         }
 
diff --git a/pandora_console/godmode/agentes/module_manager_editor_network.php b/pandora_console/godmode/agentes/module_manager_editor_network.php
index fc3439600e..656dac2b0b 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_network.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_network.php
@@ -233,7 +233,6 @@ if ($adopt === false) {
 }
 
 $snmp_versions['1'] = 'v. 1';
-$snmp_versions['2'] = 'v. 2';
 $snmp_versions['2c'] = 'v. 2c';
 $snmp_versions['3'] = 'v. 3';
 
diff --git a/pandora_console/godmode/massive/massive_add_profiles.php b/pandora_console/godmode/massive/massive_add_profiles.php
index abd41c5314..65418332c2 100644
--- a/pandora_console/godmode/massive/massive_add_profiles.php
+++ b/pandora_console/godmode/massive/massive_add_profiles.php
@@ -103,6 +103,7 @@ if ($create_profiles) {
     $groups_id = get_parameter('groups_id', -1);
     $users_id = get_parameter('users_id', -1);
     $n_added = 0;
+    $msg_error = __('Profiles cannot be added');
 
     if ($profiles_id == -1 || $groups_id == -1 || $users_id == -1) {
         $result = false;
@@ -155,6 +156,8 @@ if ($create_profiles) {
                         if ($return !== false) {
                             $n_added++;
                         }
+                    } else {
+                        $msg_error = __('The profile already exist on the user');
                     }
                 }
             }
@@ -182,7 +185,7 @@ if ($create_profiles) {
     ui_print_result_message(
         $n_added > 0,
         __('Profiles added successfully').'('.$n_added.')',
-        __('Profiles cannot be added')
+        $msg_error
     );
 }
 
diff --git a/pandora_console/godmode/massive/massive_edit_modules.php b/pandora_console/godmode/massive/massive_edit_modules.php
index 573bcc443f..fbb63c49d3 100755
--- a/pandora_console/godmode/massive/massive_edit_modules.php
+++ b/pandora_console/godmode/massive/massive_edit_modules.php
@@ -965,7 +965,6 @@ $table->data[19][0] = html_print_label_input_block(
 );
 
 $snmp_versions['1'] = 'v. 1';
-$snmp_versions['2'] = 'v. 2';
 $snmp_versions['2c'] = 'v. 2c';
 $snmp_versions['3'] = 'v. 3';
 
diff --git a/pandora_console/godmode/modules/manage_network_components_form_network.php b/pandora_console/godmode/modules/manage_network_components_form_network.php
index a19c05f2a2..02af457706 100755
--- a/pandora_console/godmode/modules/manage_network_components_form_network.php
+++ b/pandora_console/godmode/modules/manage_network_components_form_network.php
@@ -45,7 +45,6 @@ if (!$id && !isset($snmp_community)) {
 }
 
 $snmp_versions['1'] = 'v. 1';
-$snmp_versions['2'] = 'v. 2';
 $snmp_versions['2c'] = 'v. 2c';
 $snmp_versions['3'] = 'v. 3';
 
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index 4e0c73da8e..2600c9aea2 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -1280,8 +1280,7 @@ switch ($action) {
 
         $discovery_tasklist = new DiscoveryTaskList();
         $report_task_data = $discovery_tasklist->showListConsoleTask(true);
-
-        if (is_array($report_task_data) === true || strpos($report_task_data, 'class="nf"') === false) {
+        if (is_array($report_task_data) === true || (strpos($report_task_data, 'class="nf"') === false && $report_task_data !== -1)) {
             $task_table = '<div class="mrgn_top_15px white_box">';
             $task_table .= '<span class="white_table_graph_header">'.__('Report tasks');
             $task_table .= ui_print_help_tip(__('To schedule a report, do it from the editing view of each report.'), true);
@@ -1290,6 +1289,10 @@ switch ($action) {
             $task_table .= '</div></div>';
             echo $task_table;
         } else {
+            if ($report_task_data === -1) {
+                $report_task_data = '';
+            }
+
             ui_print_info_message($report_task_data.__('To schedule a report, do it from the editing view of each report.'));
         }
 
diff --git a/pandora_console/godmode/setup/license.php b/pandora_console/godmode/setup/license.php
index e11c54eec9..e3e25935f9 100644
--- a/pandora_console/godmode/setup/license.php
+++ b/pandora_console/godmode/setup/license.php
@@ -189,7 +189,8 @@ $table->data[1][1] = html_print_label_input_block(
         255,
         true,
         true
-    ).' '.($license['limit_mode'] == 0 ? __('agents') : __('modules'))
+    )
+    // .' '.($license['limit_mode'] == 0 ? __('agents') : __('modules'))
 );
 
 $table->data[2][0] = html_print_label_input_block(
@@ -202,7 +203,8 @@ $table->data[2][0] = html_print_label_input_block(
         255,
         true,
         true
-    ).' '.($license['limit_mode'] == 0 ? __('agents') : __('modules'))
+    )
+    // .' '.($license['limit_mode'] == 0 ? __('agents') : __('modules'))
 );
 
 $table->data[2][1] = html_print_label_input_block(
@@ -215,7 +217,8 @@ $table->data[2][1] = html_print_label_input_block(
         255,
         true,
         true
-    ).' '.($license['limit_mode'] == 0 ? __('agents') : __('modules'))
+    )
+    // .' '.($license['limit_mode'] == 0 ? __('agents') : __('modules'))
 );
 
 $table->data[3][0] = html_print_label_input_block(
@@ -228,7 +231,8 @@ $table->data[3][0] = html_print_label_input_block(
         255,
         true,
         true
-    ).' '.($license['limit_mode'] == 0 ? __('agents') : __('modules'))
+    )
+    // .' '.($license['limit_mode'] == 0 ? __('agents') : __('modules'))
 );
 
 $table->data[3][1] = html_print_label_input_block(
@@ -325,6 +329,18 @@ if (enterprise_installed() || defined('DESTDIR')) {
         ],
         true
     );
+    $buttons .= html_print_button(
+        __('Show agent usage details'),
+        'agents_details',
+        false,
+        'show_agents_details_dialog()',
+        [
+            'fixed_id' => 'button-agents_details',
+            'icon'     => 'next',
+            'mode'     => 'secondary',
+        ],
+        true
+    );
 
     html_print_action_buttons(
         $buttons
@@ -369,3 +385,80 @@ if (enterprise_hook('print_activate_licence_dialog') == ENTERPRISE_NOT_HOOK) {
     echo '</ul>';
     echo '</div>';
 }
+
+$table = new stdClass();
+$table->width = '100%';
+$table->class = 'databox filter-table-adv';
+$table->size = [];
+$table->size[0] = '50%';
+$table->size[1] = '50%';
+$table->data = [];
+$table->colspan = [];
+
+$table->data[0][0] = html_print_label_input_block(
+    __('Total Agents'),
+    html_print_input_text(
+        'total_agents',
+        $total_agents,
+        '',
+        30,
+        255,
+        true,
+        true
+    )
+);
+
+$table->data[0][1] = html_print_label_input_block(
+    __('Network & other devices'),
+    html_print_input_text(
+        'type_network',
+        $network_others,
+        '',
+        30,
+        255,
+        true,
+        true
+    )
+);
+
+$table->data[1][0] = html_print_label_input_block(
+    __('Workstations'),
+    html_print_input_text(
+        'type_workstation',
+        $workstations,
+        '',
+        30,
+        255,
+        true,
+        true
+    )
+);
+
+$table->data[1][1] = html_print_label_input_block(
+    __('Servers'),
+    html_print_input_text(
+        'type_server',
+        $servers,
+        '',
+        30,
+        255,
+        true,
+        true
+    )
+);
+
+$table->data[2][0] = html_print_label_input_block(
+    __('Show disabled agents'),
+    html_print_checkbox_switch(
+        'show_disabled_agents',
+        1,
+        1,
+        true,
+        false,
+        'show_disabled_agents()'
+    )
+);
+
+echo '<div id="agents_details_dialog" class="invisible left" title="'.__('Agents usage details').'">';
+html_print_table($table);
+echo '</div>';
\ No newline at end of file
diff --git a/pandora_console/godmode/users/user_management.php b/pandora_console/godmode/users/user_management.php
index 09c860ea1d..24d332c3a9 100644
--- a/pandora_console/godmode/users/user_management.php
+++ b/pandora_console/godmode/users/user_management.php
@@ -592,6 +592,9 @@ $userManagementTable->data['line2_looknfeel'][0] = html_print_select_from_sql(
     true
 );
 
+// Hidden hint to change theme.
+$hin_change_theme = ui_print_help_tip(__('When changing the theme, the login screen logo will be restricted to the default for that color scheme, if you have a custom logo, adjust it after changing the theme.'), true, '', '', 'display: none;');
+
 if (is_metaconsole() === true) {
     if (users_is_admin() === true) {
         $userManagementTable->data['line1_looknfeel'][1] = $outputMetaAccess[0];
@@ -599,7 +602,7 @@ if (is_metaconsole() === true) {
     }
 } else {
     if (function_exists('skins_print_select')) {
-        $userManagementTable->data['line1_looknfeel'][1] = __('User color scheme');
+        $userManagementTable->data['line1_looknfeel'][1] = __('User color scheme').$hin_change_theme;
         $userManagementTable->data['line2_looknfeel'][1] = skins_print_select($id_usr, 'skin', $user_info['id_skin'], '', __('None'), 0, true);
     }
 }
@@ -881,5 +884,10 @@ $(document).ready(function () {
         var host = '<?php echo $ITSM_host; ?>';
         testConectionApi(pass, host);
     });
+
+    //Hint to change theme.
+    $('#skin1').on("change", () => {
+        $('#advanced-line1_looknfeel-1 > a').css('display', 'block');
+    })
 });
 </script>
\ No newline at end of file
diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
index 36a21ecf71..af88c3e51f 100644
--- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
+++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
@@ -575,7 +575,7 @@ class DiscoveryTaskList extends HTML
                 $recon_tasks = db_get_all_rows_sql(
                     sprintf(
                         'SELECT tasks.*, apps.section AS section, apps.short_name AS short_name
-                        FROM trecon_task
+                        FROM trecon_task tasks
                         LEFT JOIN tdiscovery_apps apps ON tasks.id_app = apps.id_app
                         WHERE id_group IN (%s) AND
                         (type IN (%s) OR section = "%s")',
diff --git a/pandora_console/images/custom_logo_login/Pandora FMS alt black.png b/pandora_console/images/custom_logo_login/Pandora FMS alt black.png
new file mode 100644
index 0000000000..629774dd73
Binary files /dev/null and b/pandora_console/images/custom_logo_login/Pandora FMS alt black.png differ
diff --git a/pandora_console/images/custom_logo_login/Pandora FMS alt black.svg b/pandora_console/images/custom_logo_login/Pandora FMS alt black.svg
new file mode 100644
index 0000000000..eebed4aa64
--- /dev/null
+++ b/pandora_console/images/custom_logo_login/Pandora FMS alt black.svg	
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="1252px" height="670px" viewBox="0 0 1252 670" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Logo Copy</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Logo-Copy">
+            <g id="Group-2" transform="translate(0, 557)">
+                <path d="M193.317737,62.0611037 L146.146883,62.0611037 C149.098389,49.8354526 151.674111,39.6263094 153.609326,36.8364509 C158.520389,24.2218365 177.7919,24.8258736 177.7919,24.8258736 L193.513997,25.0104406 L193.317737,62.0611037 Z M213.757679,4.3282692 L164.812879,4.91400221 C136.315628,4.71570718 127.675625,32.6951355 127.675625,32.6951355 C127.675625,32.6951355 111.361706,90.0405321 109.385414,100.679823 C107.424336,111.325215 114.894386,110.336791 114.894386,110.336791 C114.894386,110.336791 123.357906,110.588473 127.083803,110.336791 C132.790556,109.940201 134.947894,105.411447 134.947894,105.411447 L140.45078,84.521829 L192.585946,84.521829 L192.585946,103.187492 C192.585946,110.443565 199.79888,110.432888 199.79888,110.432888 L213.64966,110.432888 C220.039519,110.432888 220.435082,103.63747 220.435082,103.63747 L220.435082,11.6102727 C220.435082,5.90852804 213.757679,4.3282692 213.757679,4.3282692 L213.757679,4.3282692 Z M831.35568,62.0611037 L784.187869,62.0611037 C787.140897,49.8354526 789.715097,39.6263094 791.662483,36.8364509 C796.570503,24.2218365 815.832886,24.8258736 815.832886,24.8258736 L831.548897,25.0104406 L831.35568,62.0611037 Z M851.800187,4.3282692 L802.855386,4.91400221 C774.356614,4.71570718 765.712047,32.6951355 765.712047,32.6951355 C765.712047,32.6951355 749.404214,90.0405321 747.424879,100.679823 C745.468365,111.325215 752.932329,110.336791 752.932329,110.336791 C752.932329,110.336791 761.398892,110.588473 765.121746,110.336791 C770.826977,109.940201 772.981273,105.411447 772.981273,105.411447 L778.494809,84.521829 L830.619325,84.521829 L830.619325,103.187492 C830.619325,110.443565 837.836823,110.432888 837.836823,110.432888 L851.689125,110.432888 C858.08507,110.432888 858.473025,103.63747 858.473025,103.63747 L858.473025,11.6102727 C858.473025,5.90852804 851.800187,4.3282692 851.800187,4.3282692 L851.800187,4.3282692 Z M431.252665,88.3257377 L402.367459,88.1228666 L402.367459,25.4723154 L428.506547,25.0772507 C443.518152,24.8926838 454.502625,33.3629322 454.037078,57.3230729 C453.381357,90.4139369 431.252665,88.3257377 431.252665,88.3257377 M428.506547,3.79866895 L382.323079,3.79866895 C382.323079,3.79866895 375.245549,4.39355403 375.245549,10.8839028 L375.245549,101.924201 C375.245549,101.924201 374.656769,109.709568 383.006185,109.709568 L426.539384,109.709568 C426.539384,109.709568 482.952712,113.94393 482.952712,56.2110954 C482.952712,-1.52021383 428.506547,3.79866895 428.506547,3.79866895 M697.245618,49.7242549 L657.252706,49.7242549 L657.252706,23.7796386 L693.022226,23.6286293 C693.022226,23.6286293 708.729108,23.9214958 708.729108,36.7496587 C708.729108,49.5762963 697.245618,49.7242549 697.245618,49.7242549 M738.679291,104.537576 L718.126765,72.9568054 C718.126765,72.9568054 714.607779,65.7037834 708.433958,65.464304 C708.433958,65.464304 735.921002,59.9288221 735.921002,38.0614566 C735.921002,38.0614566 738.828388,4.67772606 700.157568,4.67772606 L634.722367,4.67772606 C634.722367,4.67772606 629.931494,5.40989231 629.931494,10.8050424 L629.931494,103.797783 C629.931494,103.797783 630.366613,110.65269 636.770165,110.65269 L652.326429,110.65269 C652.326429,110.65269 657.117302,110.362874 657.117302,101.030805 C657.117302,91.7002615 657.112738,70.4201543 657.112738,70.4201543 L680.516358,70.4201543 C680.516358,70.4201543 684.290939,70.1272878 687.208975,73.4738978 C690.123968,76.8327105 712.06857,107.304555 712.06857,107.304555 C712.06857,107.304555 713.961186,110.802174 718.624262,110.802174 L733.87929,110.802174 C733.87929,110.802174 742.463001,111.38028 738.679291,104.537576 M326.33285,11.6427626 C326.33285,11.6427626 326.3222,4.13348247 332.856592,4.13348247 L350.381542,4.13348247 C350.381542,4.13348247 355.163286,4.29059315 355.163286,10.0472503 L355.163286,103.482342 C355.163286,103.482342 354.998976,110.517239 346.87929,110.517239 L324.254624,110.517239 C324.254624,110.517239 320.594148,111.792429 315.339249,104.92837 C310.076744,98.0627862 271.845608,39.2667853 271.845608,39.2667853 L271.845608,104.601946 C271.845608,104.601946 271.679775,110.829935 264.185383,110.829935 L250.489785,110.829935 C250.489785,110.829935 244.434633,110.199967 244.434633,103.807241 L244.434633,9.40507951 C244.434633,9.40507951 244.109054,4.61244123 250.644967,4.61244123 L274.069887,4.61244123 C274.069887,4.61244123 278.527575,4.29059315 282.680983,11.3224399 C286.886119,18.4671623 326.167018,78.7305464 326.167018,78.7305464 L326.33285,11.6427626 Z M62.861001,65.9415849 L27.2679636,65.9415849 L27.2679636,25.8859894 C27.2679636,25.8859894 48.0137066,25.6266805 60.0479416,25.6266805 C72.0806551,25.6266805 78.742844,30.1264523 78.742844,44.882653 C78.742844,65.6731239 62.861001,65.9415849 62.861001,65.9415849 M66.5701622,4.44666401 L4.86998558,4.44666401 C0.77591148,4.44666401 0,9.58613812 0,9.58613812 C0,9.58613812 0.130839975,97.7740382 0.130839975,104.186594 C0.130839975,110.5961 4.99473998,110.856934 4.99473998,110.856934 L22.0252363,110.856934 C27.531165,110.856934 27.0138907,104.055414 27.0138907,104.055414 L27.0138907,86.5978254 L69.0059157,86.5978254 C74.887629,86.5978254 106.006243,83.9116904 106.006243,43.8560949 C106.006243,3.81880352 66.5701622,4.44666401 66.5701622,4.44666401 M586.189712,67.5383175 C586.189712,67.5383175 585.791107,87.6957697 565.877567,91.286435 C565.877567,91.286435 551.088086,93.8139339 539.995594,90.6839232 C528.644466,87.4837465 523.660376,75.1147129 523.263291,68.337599 C522.873814,61.5467569 523.263291,48.1618426 523.263291,48.1618426 C523.263291,48.1618426 521.671912,29.0034923 543.587608,22.418572 C543.587608,22.418572 555.313,19.023151 566.476997,22.616867 C566.476997,22.616867 583.400995,25.6217994 586.189712,45.5748552 L586.189712,67.5383175 Z M576.531897,2.61500017 C555.816582,-3.07759246 533.987605,2.29772812 533.987605,2.29772812 C493.285723,12.7494014 496.241794,43.1175222 496.241794,43.1175222 C496.241794,43.1175222 495.510003,64.3228873 496.241794,75.0948834 C496.975106,85.8470499 506.237359,105.464529 527.322373,110.518002 C547.938798,115.476903 575.428885,111.472869 575.428885,111.472869 C612.424649,105.780276 613.168611,73.8227445 613.168611,73.8227445 L613.168611,39.0082391 C607.994346,7.37255548 576.531897,2.61500017 576.531897,2.61500017 L576.531897,2.61500017 Z" id="Pandora" fill="#181818"></path>
+                <path d="M1119.9097,4.71174128 C1119.9097,4.71174128 1126.31934,4.96647412 1126.31934,12.7503166 C1126.31934,20.5097536 1125.24676,103.278098 1125.24676,103.278098 C1125.24676,103.278098 1125.77468,111.037535 1120.44067,111.037535 L1103.33411,111.037535 C1103.33411,111.037535 1096.92751,111.037535 1096.92751,104.602099 L1096.92751,32.0230679 L1071.0212,104.602099 C1071.0212,104.602099 1068.87146,111.037535 1064.34531,111.037535 L1053.65904,111.037535 C1053.65904,111.037535 1048.3235,111.574457 1044.84407,102.469664 C1041.36464,93.3587706 1018.66086,31.217685 1018.66086,31.217685 L1018.66086,103.537407 C1018.66086,103.537407 1017.60045,111.037535 1012.79132,111.037535 L998.094645,111.037535 C998.094645,111.037535 991.150998,111.833766 991.150998,101.389719 L991.150998,11.1380255 C991.150998,11.1380255 992.21141,5.50949743 996.763424,5.50949743 L1028.81313,5.50949743 C1028.81313,5.50949743 1035.49662,5.78405977 1038.95475,18.3666419 C1041.14252,26.293867 1058.46664,74.3422775 1058.46664,74.3422775 L1079.30215,12.7503166 C1079.30215,12.7503166 1081.43058,4.71174128 1088.92193,4.71174128 L1119.9097,4.71174128 Z M880.116087,10.9247821 L880.116087,103.856509 C880.116087,103.856509 880.540556,110.830393 887.07647,110.830393 L900.726426,110.830393 C900.726426,110.830393 906.407315,111.123259 906.407315,105.131699 L906.407315,72.6341946 L959.154082,72.6341946 C959.154082,72.6341946 965.478521,72.4923374 965.478521,66.2963805 L965.478521,56.6699195 C965.478521,56.6699195 964.971897,51.6942397 958.294494,51.6942397 L906.977838,51.6942397 L906.977838,24.5995122 L969.380899,24.5995122 C969.380899,24.5995122 976.780965,24.4607057 976.780965,16.763808 L976.780965,10.0644867 C976.780965,10.0644867 976.20892,4.65408319 969.812976,4.65408319 L884.094535,4.65408319 C884.094535,4.65408319 880.253013,5.07050274 880.116087,10.9247821 M1147.46263,34.4216751 C1146.57565,65.8773678 1199.92033,66.2571791 1212.21472,69.7639503 C1215.30315,70.6623794 1224.95032,70.4305267 1224.83774,81.776053 C1224.76927,89.8908956 1213.53986,90.4415457 1213.53986,90.4415457 L1185.49446,90.4415457 C1174.84926,90.4415457 1171.63455,86.2148109 1168.30878,80.877624 C1164.9891,75.5495891 1159.54554,75.7722897 1159.54554,75.7722897 C1159.54554,75.7722897 1144.35898,73.2066571 1147.02142,91.2118456 C1149.23353,106.212102 1168.08209,110.228339 1175.28742,110.667638 L1210.54727,110.786615 C1210.54727,110.786615 1247.12313,113.791548 1251.67819,84.8801328 C1251.67819,84.8801328 1256.32909,59.8736045 1230.26912,54.3182931 C1230.26912,54.3182931 1174.084,46.4490312 1172.62194,34.6489517 C1171.4109,24.7509791 1178.95246,24.5267532 1181.60577,24.5267532 L1211.54835,24.5267532 C1211.54835,24.5267532 1219.08534,24.3116794 1223.18094,31.6363926 C1227.28414,38.9672073 1234.37688,39.6459864 1236.58747,39.6459864 C1238.80414,39.6459864 1248.57454,40.8723649 1249.12072,30.6494935 C1249.12072,30.6494935 1247.79254,5.07096035 1213.53986,5.07096035 L1182.49731,5.07096035 C1182.49731,5.07096035 1171.88102,4.34184479 1159.99588,9.73852022 C1146.02947,16.0854864 1147.46263,34.4216751 1147.46263,34.4216751" id="FMS" fill="#82B92E"></path>
+            </g>
+            <g id="Group" transform="translate(382, 0)">
+                <path d="M19,243.998431 C19,368.236168 119.511284,468.960986 243.501566,468.960986 C367.493414,468.960986 468,368.236168 468,243.998431 C468,119.762262 367.493414,19.0390144 243.501566,19.0390144 C119.511284,19.0390144 19,119.762262 19,243.998431" id="Fill-15" fill="#FFFFFF"></path>
+                <path d="M374.01683,346.333809 C359.479833,358.746887 340.328189,369.408618 319.705754,374.922929 C296.599596,381.136523 270.647504,382.831425 245.941977,379.568621 C199.353338,373.439694 157.51733,344.066623 129.363755,316.527997 C132.576603,308.907995 133.504863,306.153192 136.807087,298.628831 C142.349993,304.403413 152.17356,312.073589 156.538893,315.093367 C186.765374,336.109522 226.277595,354.242305 278.60671,351.211551 C305.106037,349.759674 329.70337,340.584313 347.14275,326.581383 C364.023919,313.055095 378.17205,293.611546 377.856881,266.582488 C377.524463,237.965146 363.457868,214.606547 348.176067,198.977702 C342.909129,193.601367 337.239214,187.858143 331.514419,183.620105 C322.430951,176.918893 312.365911,171.729139 302.213063,166.815335 C291.914389,161.763555 281.327203,156.671011 269.038728,154.038504 C289.291113,141.145648 343.735469,125.344334 350.165868,129.044582 C354.173695,131.327447 358.52962,134.988498 361.8977,137.707239 C373.003898,146.619193 382.523271,159.157703 390.633006,170.775854 C402.291142,187.536724 412.131957,206.945779 415.732102,228.781946 C424.443952,282.708357 402.377382,322.19753 374.01683,346.333809 M49.1272432,256.670214 L49.1272432,256.60593 C73.955074,217.478943 102.668427,182.056907 136.70987,152.001799 C160.200191,131.228669 187.848867,112.674121 218.489302,99.2168202 C223.624526,96.8931899 228.623334,94.0411767 234.169377,92.2365218 C239.640155,90.4350028 245.380631,88.6272121 251.266931,86.6971251 C273.643966,79.3185796 304.472561,75.5775662 329.193768,78.340209 C347.675872,80.4333578 366.073304,85.7485446 378.360211,95.3002018 C382.507591,98.4924497 387.492287,101.984167 390.182988,105.808279 C391.724339,108.01902 393.892894,113.127244 392.672984,116.172109 C391.144176,119.844135 385.513461,120.207888 380.858047,120.096567 C364.992947,119.798666 350.426157,118.103764 335.073796,119.980543 C313.269084,122.653815 295.247973,128.740409 279.685499,135.281695 C246.799677,148.947527 218.578678,171.501793 196.33022,194.248911 C173.899872,217.138708 153.166109,245.975556 136.68635,275.580676 C118.304598,308.533267 104.448116,343.293647 92.9797091,379.767745 C66.7171514,345.509093 50.4616176,303.105191 49.1272432,256.670214 M243.999216,0 C109.235243,0 0,109.220033 0,243.998432 C0,378.756448 109.235243,488 243.999216,488 C378.771029,488 488,378.756448 488,243.998432 C488,109.220033 378.771029,0 243.999216,0" id="Fill-694" fill="#82B92E"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pandora_console/include/class/AgentWizard.class.php b/pandora_console/include/class/AgentWizard.class.php
index c558977475..e700ec61bb 100644
--- a/pandora_console/include/class/AgentWizard.class.php
+++ b/pandora_console/include/class/AgentWizard.class.php
@@ -809,7 +809,6 @@ class AgentWizard extends HTML
             // Fill with SNMP versions allowed.
             $fieldsVersions = [
                 '1'  => '1',
-                '2'  => '2',
                 '2c' => '2c',
                 '3'  => '3',
             ];
diff --git a/pandora_console/include/class/CredentialStore.class.php b/pandora_console/include/class/CredentialStore.class.php
index 937f505f8d..94036c7ad8 100644
--- a/pandora_console/include/class/CredentialStore.class.php
+++ b/pandora_console/include/class/CredentialStore.class.php
@@ -1112,7 +1112,6 @@ class CredentialStore extends Wizard
                     'script'      => 'showVersion()',
                     'fields'      => [
                         '1'  => __('1'),
-                        '2'  => __('2'),
                         '2c' => __('2c'),
                         '3'  => __('3'),
                     ],
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 1004f8de0e..c8f7117fdb 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 = 'PC230818';
+$build_version = 'PC230821';
 $pandora_version = 'v7.0NG.773';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index df8fd7b2e4..05de865260 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -1744,8 +1744,8 @@ function html_print_select_multiple_modules_filtered(array $data):string
         [
             'label'       => __('Agents'),
             'label_class' => 'font-title-font',
-            'type'        => 'select',
-            'fields'      => $agents,
+            'type'        => 'select_from_sql',
+            'sql'         => 'SELECT `id_agente`,`nombre` FROM tagente',
             'name'        => 'filtered-module-agents-'.$uniqId,
             'selected'    => explode(',', $data['mAgents']),
             'return'      => true,
@@ -1925,8 +1925,7 @@ function html_print_extended_select_for_unit(
     $select_style=false,
     $unique_name=true,
     $disabled=false,
-    $no_change=0,
-    $class='w100p'
+    $no_change=0
 ) {
     global $config;
 
@@ -1958,7 +1957,7 @@ function html_print_extended_select_for_unit(
 
     ob_start();
 
-    echo '<div id="'.$uniq_name.'_default" class="'.$class.' inline_line">';
+    echo '<div id="'.$uniq_name.'_default" class="w100p inline_line">';
         html_print_select(
             $fields,
             $uniq_name.'_select',
@@ -3964,14 +3963,6 @@ function html_print_table(&$table, $return=false)
         }
     }
 
-    if (isset($table->tdid)) {
-        foreach ($table->tdid as $keyrow => $tid) {
-            foreach ($tid as $key => $id) {
-                $tdid[$keyrow][$key] = $id;
-            }
-        }
-    }
-
     if (isset($table->cellstyle)) {
         foreach ($table->cellstyle as $keyrow => $cstyle) {
             foreach ($cstyle as $key => $cst) {
@@ -4155,10 +4146,6 @@ function html_print_table(&$table, $return=false)
                     $colspan[$keyrow][$key] = '';
                 }
 
-                if (!isset($tdid[$keyrow][$key])) {
-                    $tdid[$keyrow][$key] = '';
-                }
-
                 if (!isset($rowspan[$keyrow][$key])) {
                     $rowspan[$keyrow][$key] = '';
                 }
@@ -4179,16 +4166,10 @@ function html_print_table(&$table, $return=false)
                     $style[$key] = '';
                 }
 
-                if ($tdid[$keyrow][$key] !== '') {
-                    $tid = $tdid[$keyrow][$key];
-                } else {
-                    $tid = $tableid.'-'.$keyrow.'-'.$key;
-                }
-
                 if ($class === 'datos5' && $key === 1) {
-                    $output .= '<td id="'.$tid.'" style="'.$cellstyle[$keyrow][$key].$style[$key].$valign[$key].$align[$key].$size[$key].$wrap[$key].$colspan[$keyrow][$key].' '.$rowspan[$keyrow][$key].' class="'.$class.' '.$cellclass[$keyrow][$key].'">'.$item.'</td>'."\n";
+                    $output .= '<td id="'.$tableid.'-'.$keyrow.'-'.$key.'" style="'.$cellstyle[$keyrow][$key].$style[$key].$valign[$key].$align[$key].$size[$key].$wrap[$key].$colspan[$keyrow][$key].' '.$rowspan[$keyrow][$key].' class="'.$class.' '.$cellclass[$keyrow][$key].'">'.$item.'</td>'."\n";
                 } else {
-                    $output .= '<td id="'.$tid.'" style="'.$cellstyle[$keyrow][$key].$style[$key].$valign[$key].$align[$key].$size[$key].$wrap[$key].'" '.$colspan[$keyrow][$key].' '.$rowspan[$keyrow][$key].' class="'.$class.' '.$cellclass[$keyrow][$key].'">'.$item.'</td>'."\n";
+                    $output .= '<td id="'.$tableid.'-'.$keyrow.'-'.$key.'" style="'.$cellstyle[$keyrow][$key].$style[$key].$valign[$key].$align[$key].$size[$key].$wrap[$key].'" '.$colspan[$keyrow][$key].' '.$rowspan[$keyrow][$key].' class="'.$class.' '.$cellclass[$keyrow][$key].'">'.$item.'</td>'."\n";
                 }
             }
 
diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index a039fcbc07..d45bb5c4fc 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -793,7 +793,7 @@ function modules_create_agent_module(
     // Encrypt passwords.
     if (isset($values['plugin_pass']) === true) {
         // Avoid two times encryption.
-        $plugin_pass = io_safe_output($values['plugin_pass']);
+        $plugin_pass = io_output_password($values['plugin_pass']);
 
         $values['plugin_pass'] = io_input_password($plugin_pass);
     }
diff --git a/pandora_console/include/functions_snmp_browser.php b/pandora_console/include/functions_snmp_browser.php
index 38ecabb0e0..480d0d865e 100644
--- a/pandora_console/include/functions_snmp_browser.php
+++ b/pandora_console/include/functions_snmp_browser.php
@@ -782,7 +782,6 @@ function snmp_browser_print_container(
         html_print_select(
             [
                 '1'  => 'v. 1',
-                '2'  => 'v. 2',
                 '2c' => 'v. 2c',
                 '3'  => 'v. 3',
             ],
diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php
index 7da82a2ba8..40466decb5 100644
--- a/pandora_console/include/graphs/fgraph.php
+++ b/pandora_console/include/graphs/fgraph.php
@@ -691,6 +691,17 @@ function get_build_setup_charts($type, $options, $data)
     }
 
     $chart->options()->setMaintainAspectRatio($maintainAspectRatio);
+    if (isset($options['elements']) === true) {
+        if (isset($options['elements']['center']) === true) {
+            if (isset($options['elements']['center']['text']) === true) {
+                $chart->options()->getElements()->center()->setText($options['elements']['center']['text']);
+            }
+
+            if (isset($options['elements']['center']['color']) === true) {
+                $chart->options()->getElements()->center()->setColor($options['elements']['center']['color']);
+            }
+        }
+    }
 
     // Set Responsive for responsive charts.
     $responsive = true;
diff --git a/pandora_console/include/javascript/connection_check.js b/pandora_console/include/javascript/connection_check.js
index f791a36232..d1fde9eae9 100644
--- a/pandora_console/include/javascript/connection_check.js
+++ b/pandora_console/include/javascript/connection_check.js
@@ -86,8 +86,8 @@ function showConnectionMessage(conn = true, msg = "") {
       .closest(".ui-dialog-content")
       .dialog("close");
   } else {
-    data.title = "Connection with server has been lost";
-    data.text = "Connection status: " + msg;
+    data.title = get_php_value("title_conexion_interval");
+    data.text = get_php_value("status_conexion_interval") + msg;
 
     infoMessage(data, "message_dialog_connection");
   }
diff --git a/pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_group.php b/pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_group.php
index 3cfb4a7e0c..c34a7bde7d 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_group.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_group.php
@@ -226,6 +226,10 @@ class TopNEventByGroupWidget extends Widget
             $values['legendPosition'] = $decoder['legendPosition'];
         }
 
+        if (isset($decoder['show_total_data']) === true) {
+            $values['show_total_data'] = $decoder['show_total_data'];
+        }
+
         return $values;
     }
 
@@ -329,6 +333,16 @@ class TopNEventByGroupWidget extends Widget
             ],
         ];
 
+        $inputs[] = [
+            'label'     => __('Show total data'),
+            'arguments' => [
+                'type'   => 'switch',
+                'name'   => 'show_total_data',
+                'value'  => $values['show_total_data'],
+                'return' => true,
+            ],
+        ];
+
         return $inputs;
     }
 
@@ -347,6 +361,7 @@ class TopNEventByGroupWidget extends Widget
         $values['maxHours'] = \get_parameter('maxHours', 0);
         $values['groupId'] = \get_parameter('groupId', []);
         $values['legendPosition'] = \get_parameter('legendPosition', 0);
+        $values['show_total_data'] = \get_parameter_switch('show_total_data', 0);
 
         return $values;
     }
@@ -364,7 +379,7 @@ class TopNEventByGroupWidget extends Widget
         $output = '';
 
         $size = parent::getSize();
-
+        $show_total_data = (bool) $this->values['show_total_data'];
         $this->values['groupId'] = explode(',', $this->values['groupId'][0]);
 
         if (empty($this->values['groupId']) === true) {
@@ -473,6 +488,7 @@ class TopNEventByGroupWidget extends Widget
             } else {
                 $data_pie = [];
                 $labels = [];
+                $sum = 0;
                 foreach ($result as $row) {
                     if ($row['id_agente'] == 0) {
                         $name = __('System');
@@ -494,7 +510,7 @@ class TopNEventByGroupWidget extends Widget
                     }
 
                     $name .= ' ('.$row['count'].')';
-
+                    $sum += $row['count'];
                     $labels[] = io_safe_output($name);
                     $data_pie[] = $row['count'];
                 }
@@ -524,17 +540,37 @@ class TopNEventByGroupWidget extends Widget
                 break;
             }
 
-            $output .= pie_graph(
-                $data_pie,
-                [
-                    'legend' => [
-                        'display'  => true,
-                        'position' => 'right',
-                        'align'    => 'center',
-                    ],
-                    'labels' => $labels,
-                ]
-            );
+            if ($show_total_data === true) {
+                $output .= ring_graph(
+                    $data_pie,
+                    [
+                        'legend'   => [
+                            'display'  => true,
+                            'position' => 'right',
+                            'align'    => 'center',
+                        ],
+                        'elements' => [
+                            'center' => [
+                                'text'  => $sum,
+                                'color' => '#2c3e50',
+                            ],
+                        ],
+                        'labels'   => $labels,
+                    ]
+                );
+            } else {
+                $output .= pie_graph(
+                    $data_pie,
+                    [
+                        'legend' => [
+                            'display'  => true,
+                            'position' => 'right',
+                            'align'    => 'center',
+                        ],
+                        'labels' => $labels,
+                    ]
+                );
+            }
         }
 
         return $output;
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 89360cc9ad..6bd7753c9b 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -9412,7 +9412,8 @@ div.stat-win-spinner img {
   .select2-selection--multiple
   .select2-selection__rendered {
   padding: 5px 10px 10px !important;
-  max-height: 120px;
+  min-height: 100px;
+  max-height: 250px;
   overflow: auto !important;
 }
 
@@ -10792,10 +10793,6 @@ button.ui-button.ui-widget.submit-cancel:active {
   border-color: #96a2bf;
 }
 
-.cursor-default {
-  cursor: default;
-}
-
 .hasColorPicker {
   z-index: 10;
 }
@@ -12288,14 +12285,6 @@ div.parent_graph > p.legend_background > table > tbody > tr {
   margin: 0px !important;
 }
 
-form.max_floating_element_size > ul#ul_tree_azure {
-  background-color: #fff;
-  border-spacing: 0px;
-  border-radius: 6px;
-  margin-bottom: 20px;
-  border: 1px solid #e2e2e2;
-}
-
 #grid_img {
   position: absolute;
   margin-top: -2px;
@@ -12331,6 +12320,10 @@ tr[id^="network_component-plugin-snmp-fields-dynamicMacroRow-"] input {
   width: 100% !important;
 }
 
+.label_agent_service > label {
+  margin-top: 15px;
+}
+
 .animation-blink {
   -webkit-animation: glowing 1500ms infinite;
   -moz-animation: glowing 1500ms infinite;
diff --git a/pandora_console/index.php b/pandora_console/index.php
index 3a7a9e21ec..fce3421ffe 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -1042,6 +1042,33 @@ if (isset($config['id_user']) === false) {
     }
 }
 
+if ((bool) ($config['maintenance_mode'] ?? false) === true
+    && is_user_admin($config['id_user']) === false
+) {
+    // Show maintenance web-page. For non-admin users only.
+    include $config['homedir'].'/general/maintenance.php';
+
+    while (ob_get_length() > 0) {
+        ob_end_flush();
+    }
+
+    exit('</html>');
+}
+
+if ((bool) ($config['maintenance_mode'] ?? false) === true
+    && $page !== 'advanced/command_center'
+    && is_user_admin($config['id_user']) === true
+) {
+    // Prevent access to metaconsole if not merged.
+    include 'general/admin_maintenance_mode.php';
+
+    while (ob_get_length() > 0) {
+        ob_end_flush();
+    }
+
+    exit('</html>');
+}
+
 // Enterprise support.
 if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
     include_once ENTERPRISE_DIR.'/load_enterprise.php';
@@ -1489,10 +1516,12 @@ echo html_print_div(
 
 // Connection lost alert.
 set_js_value('check_conexion_interval', $config['check_conexion_interval']);
+set_js_value('title_conexion_interval', __('Connection with console has been lost'));
+set_js_value('status_conexion_interval', __('Connection status: '));
 ui_require_javascript_file('connection_check');
 set_js_value('absolute_homeurl', ui_get_full_url(false, false, false, false));
-$conn_title = __('Connection with server has been lost');
-$conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
+$conn_title = __('Connection with console has been lost');
+$conn_text = __('Connection to the console has been lost. Please check your internet connection.');
 ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/fail@svg.svg');
 
 if ($config['pure'] == 0) {
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 080b965242..68285c2c8f 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
         <div style='padding-bottom: 50px'>
             <?php
             $version = '7.0NG.773';
-            $build = '230818';
+            $build = '230821';
             $banner = "v$version Build $build";
             error_reporting(0);
 
diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php
index d7eb3e3aed..44d64fddaf 100644
--- a/pandora_console/operation/agentes/estado_agente.php
+++ b/pandora_console/operation/agentes/estado_agente.php
@@ -223,6 +223,14 @@ if ($loaded_filter['id_filter'] > 0) {
     if (is_array($policies) === false) {
         $policies = json_decode(io_safe_output($policies), true);
     }
+
+    // Fav menu.
+    $fav_menu = [
+        'id_element' => $loaded_filter['id_filter'],
+        'url'        => 'operation/agentes/estado_agente&pure=&load_filter=1&filter_id='.$loaded_filter['id_filter'],
+        'label'      => $loaded_filter['id_name'],
+        'section'    => 'Agente',
+    ];
 }
 
 if ((bool) check_acl($config['id_user'], 0, 'AW') === true) {
@@ -267,7 +275,8 @@ ui_print_standard_header(
             'link'  => '',
             'label' => __('Views'),
         ],
-    ]
+    ],
+    (empty($fav_menu) === true) ? [] : $fav_menu
 );
 
 if ((bool) $strict_user === false) {
diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index ac494046b5..a1b852bf0f 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -89,8 +89,8 @@ $label = db_get_value(
 
 ui_require_css_file('register', 'include/styles/', true);
 // Connection lost alert.
-$conn_title = __('Connection with server has been lost');
-$conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
+$conn_title = __('Connection with console has been lost');
+$conn_text = __('Connection to the console has been lost. Please check your internet connection.');
 ui_require_javascript_file('connection_check');
 set_js_value('absolute_homeurl', ui_get_full_url(false, false, false, false));
 ui_print_message_dialog(
diff --git a/pandora_console/operation/events/export_csv.php b/pandora_console/operation/events/export_csv.php
index d820b8302a..5fad9124bd 100644
--- a/pandora_console/operation/events/export_csv.php
+++ b/pandora_console/operation/events/export_csv.php
@@ -250,6 +250,17 @@ try {
                         echo csv_format_delimiter(io_safe_output($custom_data));
                     break;
 
+                    case 'timestamp':
+                        $target_timezone = date_default_timezone_get();
+                        $utimestamp = $row['utimestamp'];
+                        $datetime = new DateTime("@{$utimestamp}");
+                        $new_datetime_zone = new DateTimeZone($target_timezone);
+                        $datetime->setTimezone($new_datetime_zone);
+                        $formatted_date = $datetime->format('Y-m-d H:i:s');
+
+                        echo csv_format_delimiter($formatted_date);
+                    break;
+
                     default:
                         echo csv_format_delimiter(io_safe_output($row[$key]));
                     break;
diff --git a/pandora_console/operation/gis_maps/public_console.php b/pandora_console/operation/gis_maps/public_console.php
index 0f6883984a..e674df41f3 100755
--- a/pandora_console/operation/gis_maps/public_console.php
+++ b/pandora_console/operation/gis_maps/public_console.php
@@ -274,8 +274,8 @@ if ($layers != false) {
 
     // Connection lost alert.
     ui_require_css_file('register', 'include/styles/', true);
-    $conn_title = __('Connection with server has been lost');
-    $conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
+    $conn_title = __('Connection with console has been lost');
+    $conn_text = __('Connection to the console has been lost. Please check your internet connection.');
     ui_require_javascript_file('connection_check');
     set_js_value('absolute_homeurl', ui_get_full_url(false, false, false, false));
     ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/fail@svg.svg');
diff --git a/pandora_console/operation/visual_console/legacy_public_view.php b/pandora_console/operation/visual_console/legacy_public_view.php
index 9157b612d9..04b8e508c1 100644
--- a/pandora_console/operation/visual_console/legacy_public_view.php
+++ b/pandora_console/operation/visual_console/legacy_public_view.php
@@ -54,8 +54,8 @@ echo '<link rel="stylesheet" href="'.$url_css_modal.'?v='.$config['current_packa
 // Connection lost alert.
 ui_require_javascript_file('connection_check', 'include/javascript/', true);
 set_js_value('absolute_homeurl', ui_get_full_url(false, false, false, false));
-$conn_title = __('Connection with server has been lost');
-$conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
+$conn_title = __('Connection with console has been lost');
+$conn_text = __('Connection to the console has been lost. Please check your internet connection.');
 ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/fail@svg.svg');
 
 require_once 'include/functions_visual_map.php';
diff --git a/pandora_console/operation/visual_console/public_view.php b/pandora_console/operation/visual_console/public_view.php
index 02bf929f58..6fdac1b949 100644
--- a/pandora_console/operation/visual_console/public_view.php
+++ b/pandora_console/operation/visual_console/public_view.php
@@ -35,8 +35,8 @@ ui_require_css_file('register', 'include/styles/', true);
 // Connection lost alert.
 ui_require_javascript_file('connection_check', 'include/javascript/', true);
 set_js_value('absolute_homeurl', ui_get_full_url(false, false, false, false));
-$conn_title = __('Connection with server has been lost');
-$conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
+$conn_title = __('Connection with console has been lost');
+$conn_text = __('Connection to the console has been lost. Please check your internet connection.');
 ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/fail@svg.svg');
 
 echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'."\n";
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 1f453f7def..13bc86f94f 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.773
-%define release     230818
+%define release     230821
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec
index 1039bcf8ef..16257ca3b3 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.773
-%define release     230818
+%define release     230821
 
 # 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 502733966f..7532b0823d 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.773
-%define release     230818
+%define release     230821
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index 752421ea36..22250771e2 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -2615,7 +2615,7 @@ INSERT INTO `twelcome_tip_file` (`twelcome_tip_file`,`filename`,`path`) VALUES (
 INSERT INTO `twelcome_tip` (`id_lang`,`id_profile`,`title`,`text`,`url`,`enable`) VALUES ('en_GB',0,'Monitor&#x20;routes&#x20;from&#x20;one&#x20;IP&#x20;to&#x20;another','There&#x20;is&#x20;a&#x20;special&#x20;plugin&#x20;that&#x20;is&#x20;used&#x20;to&#x20;visually&#x20;monitor&#x20;the&#x20;routes&#x20;from&#x20;one&#x20;IP&#x20;to&#x20;another&#x20;in&#x20;a&#x20;visual&#x20;and&#x20;dynamic&#x20;way,&#x20;as&#x20;it&#x20;changes&#x20;over&#x20;time.','https://pandorafms.com/manual/en/documentation/03_monitoring/03_remote_monitoring#monitorizacion_de_rutas',1);
 SELECT @last_id := LAST_INSERT_ID();
 INSERT INTO `twelcome_tip_file` (`twelcome_tip_file`,`filename`,`path`) VALUES (@last_id,'monitorizar_desde_ip.png','images/tips/');
-INSERT INTO `twelcome_tip` (`id_lang`,`id_profile`,`title`,`text`,`url`,`enable`) VALUES ('en_GB',0,'planned&#x20;stops','It&#x20;is&#x20;possible&#x20;to&#x20;define,&#x20;at&#x20;the&#x20;agent&#x20;level&#x20;and&#x20;at&#x20;the&#x20;module&#x20;level,&#x20;periods&#x20;in&#x20;which&#x20;the&#x20;alerts&#x20;and/or&#x20;the&#x20;collected&#x20;data&#x20;are&#x20;ignored.&#x20;It&#x20;is&#x20;perfect&#x20;for&#x20;planning&#x20;service&#x20;stops&#x20;or&#x20;disconnection&#x20;of&#x20;monitored&#x20;systems.&#x20;It&#x20;also&#x20;affects&#x20;SLA&#x20;reporting,&#x20;preventing&#x20;those&#x20;time&#x20;intervals&#x20;from&#x20;being&#x20;taken&#x20;into&#x20;account.','https://pandorafms.com/manual/en/documentation/04_using/11_managing_and_administration#paradas_de_servicio_planificadas',1);
+INSERT INTO `twelcome_tip` (`id_lang`,`id_profile`,`title`,`text`,`url`,`enable`) VALUES ('en_GB',0,'Scheduled&#x20;downtimes','It&#x20;is&#x20;possible&#x20;to&#x20;define,&#x20;at&#x20;the&#x20;agent&#x20;level&#x20;and&#x20;at&#x20;the&#x20;module&#x20;level,&#x20;periods&#x20;in&#x20;which&#x20;the&#x20;alerts&#x20;and/or&#x20;the&#x20;collected&#x20;data&#x20;are&#x20;ignored.&#x20;It&#x20;is&#x20;perfect&#x20;for&#x20;planning&#x20;service&#x20;stops&#x20;or&#x20;disconnection&#x20;of&#x20;monitored&#x20;systems.&#x20;It&#x20;also&#x20;affects&#x20;SLA&#x20;reporting,&#x20;preventing&#x20;those&#x20;time&#x20;intervals&#x20;from&#x20;being&#x20;taken&#x20;into&#x20;account.','https://pandorafms.com/manual/en/documentation/04_using/11_managing_and_administration#scheduled_downtimes',1);
 SELECT @last_id := LAST_INSERT_ID();
 INSERT INTO `twelcome_tip_file` (`twelcome_tip_file`,`filename`,`path`) VALUES (@last_id,'paradas_planificadas.png','images/tips/');
 INSERT INTO `twelcome_tip` (`id_lang`,`id_profile`,`title`,`text`,`url`,`enable`) VALUES ('en_GB',0,'Customize&#x20;alert&#x20;emails','Did&#x20;you&#x20;know&#x20;that&#x20;Pandora&#x20;alert&#x20;emails&#x20;can&#x20;be&#x20;customized?&#x20;You&#x20;only&#x20;have&#x20;to&#x20;edit&#x20;the&#x20;default&#x20;HTML&#x20;code&#x20;of&#x20;the&#x20;email&#x20;type&#x20;alert&#x20;actions.','https://pandorafms.com/manual/en/documentation/04_using/01_alerts#editing_an_action',1);
diff --git a/pandora_console/vendor/artica/phpchartjs/src/Options/Elements.php b/pandora_console/vendor/artica/phpchartjs/src/Options/Elements.php
index 116fc46758..b63513bc23 100644
--- a/pandora_console/vendor/artica/phpchartjs/src/Options/Elements.php
+++ b/pandora_console/vendor/artica/phpchartjs/src/Options/Elements.php
@@ -8,6 +8,7 @@ use Artica\PHPChartJS\Options\Elements\Arc;
 use Artica\PHPChartJS\Options\Elements\Line;
 use Artica\PHPChartJS\Options\Elements\Point;
 use Artica\PHPChartJS\Options\Elements\Rectangle;
+use Artica\PHPChartJS\Options\Elements\Center;
 use JsonSerializable;
 
 /**
@@ -39,6 +40,11 @@ class Elements implements ArraySerializableInterface, JsonSerializable
      */
     private $arc;
 
+    /**
+     * @var Center
+     */
+    private $center;
+
     /**
      * @return Rectangle
      */
@@ -119,6 +125,26 @@ class Elements implements ArraySerializableInterface, JsonSerializable
         return $this->arc;
     }
 
+    /**
+     * @return Center
+     */
+    public function center()
+    {
+        if (is_null($this->center)) {
+            $this->center = new Center();
+        }
+
+        return $this->center;
+    }
+
+    /**
+     * @return Center
+     */
+    public function getCenter()
+    {
+        return $this->center;
+    }
+
     /**
      * @return array
      */
diff --git a/pandora_console/vendor/artica/phpchartjs/src/Options/Elements/Center.php b/pandora_console/vendor/artica/phpchartjs/src/Options/Elements/Center.php
new file mode 100644
index 0000000000..d8b35b4e89
--- /dev/null
+++ b/pandora_console/vendor/artica/phpchartjs/src/Options/Elements/Center.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace Artica\PHPChartJS\Options\Elements;
+
+use Artica\PHPChartJS\ArraySerializableInterface;
+use Artica\PHPChartJS\Delegate\ArraySerializable;
+use JsonSerializable;
+
+/**
+ * Class Center
+ * @package Artica\PHPChartJS\Options\Elements
+ */
+class Center implements ArraySerializableInterface, JsonSerializable
+{
+    use ArraySerializable;
+
+    /**
+     * Text center graph.
+     * @var string
+     */
+    private $text;
+
+    /**
+     * Color text.
+     * @default '#000'
+     * @var string
+     */
+    private $color;
+
+    /**
+     * Get text center graph.
+     *
+     * @return  string
+     */
+    public function getText()
+    {
+        return $this->text;
+    }
+
+    /**
+     * Set text center graph.
+     *
+     * @param  string  $text  Text center graph.
+     *
+     * @return  self
+     */
+    public function setText(string $text)
+    {
+        $this->text = $text;
+
+        return $this;
+    }
+
+    /**
+     * Get color text.
+     *
+     * @return  string
+     */
+    public function getColor()
+    {
+        return $this->color;
+    }
+
+    /**
+     * Set color text.
+     *
+     * @param  string  $color  Color text.
+     *
+     * @return  self
+     */
+    public function setColor(string $color)
+    {
+        $this->color = $color;
+
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    public function jsonSerialize()
+    {
+        return $this->getArrayCopy();
+    }
+}
diff --git a/pandora_console/vendor/artica/phpchartjs/src/Renderer/JavaScript.php b/pandora_console/vendor/artica/phpchartjs/src/Renderer/JavaScript.php
index 100276743f..8786ca6fe8 100644
--- a/pandora_console/vendor/artica/phpchartjs/src/Renderer/JavaScript.php
+++ b/pandora_console/vendor/artica/phpchartjs/src/Renderer/JavaScript.php
@@ -32,6 +32,49 @@ class JavaScript extends Renderer
         if (empty($this->chart->defaults()->getWatermark()) === false) {
           $script[] = 'const chart_watermark_'.$this->chart->getId().' = {
             id: "chart_watermark_'.$this->chart->getId().'",
+            beforeDraw: (chart) => {
+              if (Object.prototype.hasOwnProperty.call(chart, "config") &&
+                  Object.prototype.hasOwnProperty.call(chart.config.options, "elements") &&
+                  Object.prototype.hasOwnProperty.call(chart.config.options.elements, "center"))
+              {
+                var ctx = chart.ctx;
+
+                ctx.save();
+
+                var centerConfig = chart.config.options.elements.center;
+                var txt = centerConfig.text;
+                var color = centerConfig.color || "#000";
+                ctx.textAlign = "center";
+                ctx.textBaseline = "middle";
+                var centerX = (chart.chartArea.left + chart.chartArea.right) / 2;
+                var centerY = (chart.chartArea.top + chart.chartArea.bottom) / 2;
+
+                var outerRadius = Math.min(ctx.canvas.width, ctx.canvas.height) / 2;
+
+                var padding = 20;
+
+                var innerRadius = outerRadius - padding;
+
+                ctx.font = "30px ";
+                var sidePaddingCalculated = (93/100) * (innerRadius * 2)
+
+                var stringWidth = ctx.measureText(txt).width;
+                var elementWidth = (innerRadius * 2) - sidePaddingCalculated;
+
+                var widthRatio = elementWidth / stringWidth;
+                var newFontSize = Math.floor(30 * widthRatio);
+                var elementHeight = (innerRadius * 2);
+
+                var fontSizeToUse = Math.min(newFontSize, elementHeight);
+
+                ctx.font = fontSizeToUse + "px Lato, sans-serif";
+                ctx.fillStyle = color;
+
+                ctx.fillText(txt, centerX, centerY);
+
+                ctx.restore();
+              }
+            },
             afterDraw: (chart) => {
               const image = new Image();
                 image.src = "'.$this->chart->defaults()->getWatermark()->getSrc().'";
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index d4f34d3fcc..d1c389ec07 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.773-230818
+Version: 7.0NG.773-230821
 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 7dd5d97d78..c1f979f671 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.773-230818"
+pandora_version="7.0NG.773-230821"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 7c4a0292f6..ef57d492e5 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.773";
-my $pandora_build = "230818";
+my $pandora_build = "230821";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 3aa75eef89..91ef9cca80 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -1230,7 +1230,7 @@ sub pandora_execute_action ($$$$$$$$$;$$) {
 		$field19 = defined($alert->{'field19'})  && $alert->{'field19'} ne "" ? $alert->{'field19'} : $action->{'field19'};
 		$field20 = defined($alert->{'field20'})  && $alert->{'field20'} ne "" ? $alert->{'field20'} : $action->{'field20'};
 	}
-	
+
 	# Recovery fields, thanks to Kato Atsushi
 	if ($alert_mode == RECOVERED_ALERT) {
 		# Field 1 is a special case where [RECOVER] prefix is not added even when it is defined
@@ -1398,6 +1398,7 @@ sub pandora_execute_action ($$$$$$$$$;$$) {
 		_timestamp_ => (defined($timestamp)) ? $timestamp : strftime ("%Y-%m-%d %H:%M:%S", localtime()),
 		_timezone_ => strftime ("%Z", localtime()),
 		_data_ => $data,
+		_dataunit_ => (defined ($module)) ? $module->{'unit'} : '',
 		_prevdata_ => undef,
 		_homeurl_ => $pa_config->{'public_url'},
 		_alert_name_ => $alert->{'name'},
@@ -1586,11 +1587,11 @@ sub pandora_execute_action ($$$$$$$$$;$$) {
 			my $period = $hours * 3600; # Hours to seconds
 			if($threshold == 0){
 				$params->{"other"} = $period . '%7C1%7C0%7C225%7C%7C14';
-				$cid = 'module_graph_' . $hours . 'h';
+				$cid = 'module_graph_' . (defined($module) && $module ne '' ?  ($module . '_') : '') . $hours . 'h';
 			}
 			else{
 				$params->{"other"} = $period . '%7C1%7C1%7C225%7C%7C14';
-				$cid = 'module_graphth_' . $hours . 'h';
+				$cid = 'module_graphth_' . (defined($module) && $module ne '' ?  ($module . '_') : '') . $hours . 'h';
 			}
 
 			if (defined($module)) {
@@ -1688,7 +1689,7 @@ sub pandora_execute_action ($$$$$$$$$;$$) {
 			. "Content-Location: " . $dataname . "\n\n"
 			. $base64_data . "\n";
 		}
-		
+
 		if ($pa_config->{"mail_in_separate"} != 0){
 			foreach my $address (split (',', $field1)) {
 				# Remove blanks
@@ -5041,6 +5042,9 @@ sub on_demand_macro($$$$$$;$) {
 		my $field_number = $1;
 		my $field_value = get_db_value($dbh, 'SELECT description FROM tagent_custom_data WHERE id_field=? AND id_agent=?', $field_number, $agent_id);
 		return (defined($field_value)) ? $field_value : '';	
+	} elsif ($macro eq '_dataunit_'){
+		return '' unless defined ($module);
+		my $field_value = get_db_value($dbh, 'SELECT unit FROM tagente_modulo where id_agente_modulo = ? limit 1', $module->{'id_agente_modulo'});	
 	} elsif ($macro eq '_prevdata_') {
 		return '' unless defined ($module);
 		if ($module->{'id_tipo_modulo'} eq 3){
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index f85a54b118..1e92a2551f 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.773";
-my $pandora_build = "230818";
+my $pandora_build = "230821";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 1c6aeb6c96..0acc41a122 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.773
-%define release     230818
+%define release     230821
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index e97549454d..3f1f04d1c8 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.773"
-PI_BUILD="230818"
+PI_BUILD="230821"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 1604dac06c..a720baad8a 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.773 Build 230818";
+my $version = "7.0NG.773 Build 230821";
 
 # Pandora server configuration
 my %conf;
@@ -146,7 +146,10 @@ sub pandora_purgedb ($$$) {
 	}
 
 	# Delete old data
-	if ($conf->{'_days_purge'} > 0) {
+	if (!defined($conf->{'_days_purge'})){
+		log_message ('PURGE', 'days_purge is not defined. Old data will not be deleted.');
+	}
+	elsif ($conf->{'_days_purge'} > 0) {
 
 		# Delete old numeric data
 		pandora_delete_old_module_data ($dbh, 'tagente_datos', $ulimit_access_timestamp, $ulimit_timestamp);
@@ -164,9 +167,7 @@ sub pandora_purgedb ($$$) {
 	pandora_delete_old_tplanned_downtime(\%conf, $dbh, $h_conf);
 
 	# String data deletion
-	if (!defined($conf->{'_string_purge'})){
-		$conf->{'_string_purge'} = 7;
-	}
+	$conf->{'_string_purge'} //= 7;
 
 	if ($conf->{'_string_purge'} > 0) {
 		$ulimit_access_timestamp = time() - 86400;
@@ -178,9 +179,8 @@ sub pandora_purgedb ($$$) {
 	}
 
 	# Delete event data
-	if (!defined($conf->{'_event_purge'})){
-		$conf->{'_event_purge'}= 10;
-	}
+	$conf->{'_event_purge'} //= 10;
+
 	if ($conf->{'_event_purge'} > 0) {
 		my $event_limit = time() - 86400 * $conf->{'_event_purge'};
 		
@@ -205,7 +205,7 @@ sub pandora_purgedb ($$$) {
 	}
 
 	# Delete audit data
-	$conf->{'_audit_purge'}= 7 if (!defined($conf->{'_audit_purge'}));
+	$conf->{'_audit_purge'} //= 7;
 	if ($conf->{'_audit_purge'} > 0) {
 		log_message ('PURGE', "Deleting old audit data (More than " . $conf->{'_audit_purge'} . " days).");
 		my $audit_limit = time() - 86400 * $conf->{'_audit_purge'};
@@ -216,7 +216,8 @@ sub pandora_purgedb ($$$) {
 	}
 
 	# Delete SNMP trap data
-	$conf->{'_trap_purge'}= 7 if (!defined($conf->{'_trap_purge'}));
+	$conf->{'_trap_purge'} //= 7;
+	
 	if ($conf->{'_trap_purge'} > 0) {
 		log_message ('PURGE', "Deleting old SNMP traps (More than " . $conf->{'_trap_purge'} . " days).");
 
@@ -237,7 +238,8 @@ sub pandora_purgedb ($$$) {
 	enterprise_hook("pandora_purge_service_elements", [$dbh, $conf]);
 
 	# Delete GIS  data
-	$conf->{'_gis_purge'}= 15 if (!defined($conf->{'_gis_purge'}));
+	$conf->{'_gis_purge'} //= 15;
+	
 	if ($conf->{'_gis_purge'} > 0) {
 		log_message ('PURGE', "Deleting old GIS data (More than " . $conf->{'_gis_purge'} . " days).");
 		my $gis_limit = strftime ("%Y-%m-%d %H:%M:%S", localtime(time() - 86400 * $conf->{'_gis_purge'}));
@@ -293,8 +295,6 @@ sub pandora_purgedb ($$$) {
 		log_message ('PURGE', "No agent access data.");
 	}
 	
-	
-	
 	# Purge the reports
    	if (defined($conf->{'_enterprise_installed'}) && $conf->{'_enterprise_installed'} eq '1' &&
 		defined($conf->{'_metaconsole'}) && $conf->{'_metaconsole'} eq '1'){
@@ -347,7 +347,10 @@ sub pandora_purgedb ($$$) {
 	
 	
 	# Delete old netflow data
-	if ($conf->{'_netflow_max_lifetime'} > 0) {
+	if (!defined($conf->{'_netflow_max_lifetime'})){
+		log_message ('PURGE', 'netflow_max_lifetime is not defined. Old netflow data will not be deleted.');
+	}
+	elsif ($conf->{'_netflow_max_lifetime'} > 0) {
 		log_message ('PURGE', "Deleting old netflow data.");
 		if (! defined ($conf->{'_netflow_path'}) || ! -d $conf->{'_netflow_path'}) {
 			log_message ('!', "Netflow data directory does not exist, skipping.");
@@ -364,7 +367,10 @@ sub pandora_purgedb ($$$) {
 	}
 
 	# Delete old sflow data
-	if ($conf->{'_sflow_max_lifetime'} > 0) {
+	if (!defined($conf->{'_sflow_max_lifetime'})){
+		log_message ('PURGE', 'sflow_max_lifetime is not defined. Old sflow data will not be deleted.');
+	}
+	elsif ($conf->{'_sflow_max_lifetime'} > 0) {
 		log_message ('PURGE', "Deleting old sflow data.");
 		if (! defined ($conf->{'_sflow_path'}) || ! -d $conf->{'_sflow_path'}) {
 			log_message ('!', "sflow data directory does not exist, skipping.");
@@ -384,7 +390,7 @@ sub pandora_purgedb ($$$) {
 	log_message ('PURGE', "Deleting old log data.");
 	if (defined($conf->{'_days_purge_old_information'}) && $conf->{'_days_purge_old_information'} > 0) {
 		log_message ('PURGE', 'Deleting log data older than ' . $conf->{'_days_purge_old_information'} . ' days.');
-    enterprise_hook ('pandora_purge_logs', [$dbh, $conf]);
+    	enterprise_hook ('pandora_purge_logs', [$dbh, $conf]);
 	}
 	else {
 		log_message ('PURGE', 'days_purge_old_data is set to 0. Old log data will not be deleted.');
@@ -401,7 +407,7 @@ sub pandora_purgedb ($$$) {
 
 	# Delete old special days
 	log_message ('PURGE', "Deleting old special days.");
-	if ($conf->{'_num_past_special_days'} > 0) {
+	if (defined($conf->{'_num_past_special_days'}) && $conf->{'_num_past_special_days'} > 0) {
 		log_message ('PURGE', 'Deleting special days older than ' . $conf->{'_num_past_special_days'} . ' days.');
 		if (${RDBMS} eq 'oracle') {
 			db_do ($dbh, "DELETE FROM talert_special_days
@@ -419,7 +425,7 @@ sub pandora_purgedb ($$$) {
 
 	# Delete old messages
 	log_message ('PURGE', "Deleting old messages.");
-	if ($conf->{'_delete_old_messages'} > 0) {
+	if (defined($conf->{'_delete_old_messages'}) && $conf->{'_delete_old_messages'} > 0) {
 		my $message_limit = time() - 86400 * $conf->{'_delete_old_messages'};
 		db_do ($dbh, "DELETE FROM tmensajes WHERE timestamp < ?", $message_limit);
 	}
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 63e8b2f883..37e9a02eb5 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.773 Build 230818";
+my $version = "7.0NG.773 Build 230821";
 
 # save program name for logging
 my $progname = basename($0);
@@ -5411,7 +5411,7 @@ sub cli_create_synthetic() {
 
 	my @module_data;
 
-	if (@ARGV[$#ARGV] == "use_alias") {
+	if (@ARGV[$#ARGV] eq "use_alias") {
 		@module_data = @ARGV[5..$#ARGV-1];
 	} else {
 		@module_data = @ARGV[5..$#ARGV];
@@ -5531,7 +5531,7 @@ sub cli_create_synthetic() {
 		}
 	} else {
 		my $id_agent = int(get_agent_id($dbh,$agent_name));
-		
+
 		if ($id_agent > 0) {
 			foreach my $i (0 .. $#module_data) {
 				my @split_data = split(',',$module_data[$i]);