diff --git a/include/events/VTEventTrigger.inc b/include/events/VTEventTrigger.inc
index 1d4e8ace414e270e3810cb563bfaccb1f856f701..f7c4f5cd30fd631b02fab4e1467a52046df7c444 100644
--- a/include/events/VTEventTrigger.inc
+++ b/include/events/VTEventTrigger.inc
@@ -15,7 +15,7 @@
 		private static $cache = array();
 		private static $cacheLookupType = '';
 
-		private static $mandatoryEventClass = array('VTEntityDelta', 'ModTrackerHandler');
+		private static $mandatoryEventClass = array('VTEntityDelta', 'ModTrackerHandler', 'PBXManagerBatchHandler');
 
 		const CACHE_LOOKUP_TYPE_ALL = 'ALL';
 
diff --git a/layouts/vlayout/modules/Potentials/dashboards/TopPotentialsContents.tpl b/layouts/vlayout/modules/Potentials/dashboards/TopPotentialsContents.tpl
index 049ce6ea978fdaa642813ee557927e60949f8ec7..2074c8e11e86ae4a69af14000f7b29fad1e30b52 100644
--- a/layouts/vlayout/modules/Potentials/dashboards/TopPotentialsContents.tpl
+++ b/layouts/vlayout/modules/Potentials/dashboards/TopPotentialsContents.tpl
@@ -40,7 +40,7 @@
 	</div>
 {else}
 	<span class="noDataMsg">
-		{vtranslate('LBL_NO')} {vtranslate($MODULE_NAME, $MODULE_NAME)} {vtranslate('LBL_MATCHED_THIS_CRITERIA')}
+		{vtranslate('LBL_EQ_ZERO')} {vtranslate($MODULE_NAME, $MODULE_NAME)} {vtranslate('LBL_MATCHED_THIS_CRITERIA')}
 	</span>
 {/if}
-</div>
\ No newline at end of file
+</div>
diff --git a/packages/vtiger/mandatory/Import.zip b/packages/vtiger/mandatory/Import.zip
index b7c12eab6e3088cf85e23820b51c74e369ebdf8b..7745d16f9808a63d7fac89f16e29be44eade7bfe 100644
Binary files a/packages/vtiger/mandatory/Import.zip and b/packages/vtiger/mandatory/Import.zip differ
diff --git a/pkg/vtiger/modules/Import/modules/Import/helpers/Utils.php b/pkg/vtiger/modules/Import/modules/Import/helpers/Utils.php
index 2da70b661c1bbfd0afc7d807966d03bdeab93cb3..0b42706ea15da7737ea4b671b1875a4c986b3141 100644
--- a/pkg/vtiger/modules/Import/modules/Import/helpers/Utils.php
+++ b/pkg/vtiger/modules/Import/modules/Import/helpers/Utils.php
@@ -16,7 +16,19 @@ class Import_Utils_Helper {
 	static $AUTO_MERGE_OVERWRITE = 2;
 	static $AUTO_MERGE_MERGEFIELDS = 3;
 
-	static $supportedFileEncoding = array('UTF-8'=>'UTF-8', 'ISO-8859-1'=>'ISO-8859-1');
+	static $supportedFileEncoding = array(
+		'UTF-8'=>'UTF-8',
+		'ISO-8859-1'=>'ISO-8859-1',
+		'Windows-1250'=>'Windows-1250',
+		'Windows-1251'=>'Windows-1251',
+		'Windows-1252'=>'Windows-1252',
+		'Windows-1253'=>'Windows-1253',
+		'Windows-1254'=>'Windows-1254',
+		'Windows-1255'=>'Windows-1255',
+		'Windows-1256'=>'Windows-1256',
+		'Windows-1257'=>'Windows-1257',
+		'Windows-1258'=>'Windows-1258',
+		);
 	static $supportedDelimiters = array(','=>'comma', ';'=>'semicolon');
 	static $supportedFileExtensions = array('csv','vcf');
 
diff --git a/pkg/vtiger/modules/Import/modules/Import/readers/FileReader.php b/pkg/vtiger/modules/Import/modules/Import/readers/FileReader.php
index 8f55f64fad5947c7792db7c1d9d8c5eb04a6e143..dd77e669d1237577e549642cd6d1442758aac2ad 100644
--- a/pkg/vtiger/modules/Import/modules/Import/readers/FileReader.php
+++ b/pkg/vtiger/modules/Import/modules/Import/readers/FileReader.php
@@ -70,7 +70,10 @@ class Import_FileReader_Reader {
 	}
 
 	public function convertCharacterEncoding($value, $fromCharset, $toCharset) {
-		if (function_exists("mb_convert_encoding")) {
+		if (function_exists("mb_convert_encoding")
+				&& function_exists("mb_list_encodings")
+				&& in_array($fromCharset, mb_list_encodings())
+				&& in_array($toCharset, mb_list_encodings())) {
 			$value = mb_convert_encoding($value, $toCharset, $fromCharset);
 		} else {
 			$value = iconv($fromCharset, $toCharset, $value);