diff --git a/kcfinder/lib/class_gd.php b/kcfinder/lib/class_gd.php
index 0ac2aaea996434370ce1822fba0a33df657830b5..adfc89784d4af89c457c5986b6f2d51edbe35233 100644
--- a/kcfinder/lib/class_gd.php
+++ b/kcfinder/lib/class_gd.php
@@ -52,13 +52,8 @@ class gd {
             $height = @imagesy($image);
 
         } elseif (is_array($image)) {
-            $key = key($image);
-            $width = current($image);
-            next($image);
-
-            $key = key($image);
-            $height = current($image);
-            next($image);
+            list($key, $width) = each($image);
+            list($key, $height) = each($image);
             $image = imagecreatetruecolor($width, $height);
 
         } elseif (false !== (list($width, $height, $type) = @getimagesize($image))) {
@@ -76,8 +71,8 @@ class gd {
         }
 
         $return = (
-            ((is_resource($image) && get_resource_type($image) === 'gd') ||
-            (is_object($image) && $image instanceof \GDImage)) &&
+            is_resource($image) &&
+            (get_resource_type($image) == "gd") &&
             isset($width) &&
             isset($height) &&
             (preg_match('/^[1-9][0-9]*$/', $width) !== false) &&
diff --git a/layouts/v7/modules/Settings/Groups/resources/Edit.js b/layouts/v7/modules/Settings/Groups/resources/Edit.js
index 1b0a169cd5d0467f71ec27bebfbfa23efc8345ba..ea8291c483b525e3dc3f55877bc7e42a34c6578c 100644
--- a/layouts/v7/modules/Settings/Groups/resources/Edit.js
+++ b/layouts/v7/modules/Settings/Groups/resources/Edit.js
@@ -60,7 +60,7 @@ Settings_Vtiger_Edit_Js("Settings_Groups_Edit_Js",{},{
 								form.submit();
 							},
 							function(data, err){
-								app.helper.showErrorNotification({message:app.vtranslate('JS_DUPLICATES_EXIST')});
+								app.helper.showErrorNotification({message:data.message});
 								jQuery('.saveButton').removeAttr('disabled');
 								return false;
 							}
diff --git a/modules/Calendar/uitypes/Datetime.php b/modules/Calendar/uitypes/Datetime.php
index 3b1c244e5e40e43d83c9c3825dba1a473a5da58e..8c72c809eff2fdc38d0248bb1e880a6215cac4d0 100644
--- a/modules/Calendar/uitypes/Datetime.php
+++ b/modules/Calendar/uitypes/Datetime.php
@@ -13,7 +13,7 @@ class Calendar_Datetime_UIType extends Vtiger_Datetime_UIType {
 	public function getDisplayValue($value, $record=false, $recordInstance=false) {
 		//Since date_start and due_date fields of calendar can have time appended or removed
 		if($this->hasTimeComponent($value)) {
-			return self::getDisplayDateTimeValue($value);
+			return parent::getDisplayValue($value);
 		}else{
 			return $this->getDisplayDateValue($value);
 		}
diff --git a/modules/Settings/MailConverter/handlers/MailScannerAction.php b/modules/Settings/MailConverter/handlers/MailScannerAction.php
index 84e3738f62f0c794fc1e90a8261a2113f09bab1b..f769f16b6993207aacc675bacd3995d6a1ef5a83 100644
--- a/modules/Settings/MailConverter/handlers/MailScannerAction.php
+++ b/modules/Settings/MailConverter/handlers/MailScannerAction.php
@@ -548,8 +548,8 @@ class Vtiger_MailScannerAction {
 
 		$mimetype = MailAttachmentMIME::detect($saveasfile);
 
-		$adb->pquery("INSERT INTO vtiger_attachments SET attachmentsid=?, name=?, description=?, type=?, path=?",
-			Array($attachid, $filename, $description, $mimetype, $dirname));
+		$adb->pquery("INSERT INTO vtiger_attachments SET attachmentsid=?, name=?, description=?, type=?, storedname=?, path=?",
+			Array($attachid, $filename, $description, $mimetype, $filename, $dirname));
 
 		return true;
 	}
diff --git a/modules/Settings/Vtiger/models/ConfigModule.php b/modules/Settings/Vtiger/models/ConfigModule.php
index f316486258d21038c1f8694c1bed63a2fc3d2f1d..09c10b560c2558d7c6df1d3e1175964df057420b 100644
--- a/modules/Settings/Vtiger/models/ConfigModule.php
+++ b/modules/Settings/Vtiger/models/ConfigModule.php
@@ -153,9 +153,7 @@ class Settings_Vtiger_ConfigModule_Model extends Settings_Vtiger_Module_Model {
 			return "LBL_INVALID_EMAILID";
 		} else if(array_key_exists('HELPDESK_SUPPORT_NAME',$updatedFields) && preg_match ('/[\'";?><]/', $updatedFields['HELPDESK_SUPPORT_NAME'])) {
 			return "LBL_INVALID_SUPPORT_NAME";
-		} else if((array_key_exists('upload_maxsize',$updatedFields) && !filter_var(ltrim($updatedFields['upload_maxsize'],'0'), FILTER_VALIDATE_INT))
-				|| (array_key_exists('list_max_entries_per_page',$updatedFields) &&  !filter_var(ltrim($updatedFields['list_max_entries_per_page'], '0'), FILTER_VALIDATE_INT))
-				|| (array_key_exists('listview_max_textlength',$updatedFields) && !filter_var(ltrim($updatedFields['listview_max_textlength'], '0'), FILTER_VALIDATE_INT))) {
+                } else if((array_key_exists('upload_maxsize',$updatedFields) && !filter_var(ltrim($updatedFields['upload_maxsize'],'0'), FILTER_VALIDATE_INT)) || (array_key_exists('list_max_entries_per_page',$updatedFields) &&  filter_var(ltrim($updatedFields['list_max_entries_per_page'], '0'), FILTER_VALIDATE_INT, array("options" => array("min_range"=>1, "max_range"=>100))) === false) || (array_key_exists('listview_max_textlength',$updatedFields) && filter_var(ltrim($updatedFields['listview_max_textlength'], '0'), FILTER_VALIDATE_INT , array("options" => array("min_range"=>1, "max_range"=>100))) === false)){
 			return "LBL_INVALID_NUMBER";
 		}
 		return true;
diff --git a/modules/Vtiger/helpers/Util.php b/modules/Vtiger/helpers/Util.php
index dbc43a38edbf01867daa0b7652b25d76c8341143..ee94c7792e56776804a92ca6debbb92007fbe75c 100644
--- a/modules/Vtiger/helpers/Util.php
+++ b/modules/Vtiger/helpers/Util.php
@@ -140,7 +140,7 @@ class Vtiger_Util_Helper {
 		global $adb;
 		$query = 'Select deleted from vtiger_crmentity where crmid=?';
 		$result = $adb->pquery($query, array($recordId));
-		return $adb->query_result($result, 'deleted');
+		return $adb->query_result($result, 0, 'deleted');
 	}
 
 	/**
diff --git a/modules/com_vtiger_workflow/VTJsonCondition.inc b/modules/com_vtiger_workflow/VTJsonCondition.inc
index 11a11f10e64a062d4843e93cb536c7190fc38a32..210aa5e419b5f90921e8e0bd93a8288e15062abe 100644
--- a/modules/com_vtiger_workflow/VTJsonCondition.inc
+++ b/modules/com_vtiger_workflow/VTJsonCondition.inc
@@ -360,7 +360,7 @@ class VTJsonCondition {
 				}
 				return false;
 			case "is not empty":
-				if(empty($fieldValue)) {
+				if(empty($fieldValue) && $fieldValue!=0) {
 					return false;
 				}
 				return true;