diff --git a/core/factory/settings.php b/core/factory/settings.php
index 1ee7e0f439..b525b50c23 100644
--- a/core/factory/settings.php
+++ b/core/factory/settings.php
@@ -54,8 +54,8 @@
     'use_editor' => 1,
     'editor_css_path' => '',
     'filemanager_path' => '[(base_path)]',
-    'upload_files' => 'bmp,ico,gif,jpeg,jpg,png,psd,tif,tiff,fla,flv,swf,aac,au,avi,css,cache,doc,docx,gz,gzip,htaccess,htm,html,js,mp3,mp4,mpeg,mpg,ods,odp,odt,pdf,ppt,pptx,rar,tar,tgz,txt,wav,wmv,xls,xlsx,xml,z,zip,JPG,JPEG,PNG,GIF,svg,tpl',
-    'upload_images' => 'bmp,ico,gif,jpeg,jpg,png,psd,tif,tiff,svg',
+    'upload_files' => 'bmp,ico,gif,jpeg,jpg,png,psd,tif,tiff,fla,flv,swf,aac,au,avi,css,cache,doc,docx,gz,gzip,htaccess,htm,html,js,mp3,mp4,mpeg,mpg,ods,odp,odt,pdf,ppt,pptx,rar,tar,tgz,txt,wav,wmv,xls,xlsx,xml,z,zip,JPG,JPEG,PNG,GIF,svg,tpl,webp,avif',
+    'upload_images' => 'bmp,ico,gif,jpeg,jpg,png,psd,tif,tiff,svg,webp,avif',
     'upload_media' => 'au,avi,mp3,mp4,mpeg,mpg,wav,wmv',
     'upload_maxsize' => '5000000',
     'new_file_permissions' => '0644',
diff --git a/core/factory/version.php b/core/factory/version.php
index 1327dc7147..ffdf09e364 100644
--- a/core/factory/version.php
+++ b/core/factory/version.php
@@ -1,7 +1,7 @@
 <?php
 return [
-    'version' => '3.2.0 Beta', // Current version number
-    'release_date' => 'May 10, 2023', // Date of release
+    'version' => '3.2.0', // Current version number
+    'release_date' => 'May 15, 2023', // Date of release
     'branch' => 'Evolution CMS', // Codebase name
-    'full_appname' => 'Evolution CMS 3.2.0 Beta (May 10, 2023)'
+    'full_appname' => 'Evolution CMS 3.2.0 (May 15, 2023)'
 ];
diff --git a/core/includes/define.inc.php b/core/includes/define.inc.php
index a4828b3cfc..992cf5fc93 100644
--- a/core/includes/define.inc.php
+++ b/core/includes/define.inc.php
@@ -185,7 +185,10 @@
 }
 
 if (is_cli()) {
-    define('MODX_CLI', true);
+    if (!defined('MODX_CLI')) {
+        define('MODX_CLI', true);
+    }
+
     if (!(defined('MODX_BASE_PATH') || defined('MODX_BASE_URL'))) {
         throw new RuntimeException('Please, define MODX_BASE_PATH and MODX_BASE_URL on cli mode');
     }