diff --git a/include/Webservices/ConvertLead.php b/include/Webservices/ConvertLead.php
index 74193de8cac934a3e221b44870cfb95546bfb6a5..8ba28a40eabce0d6948e365f915fb6445f781c11 100644
--- a/include/Webservices/ConvertLead.php
+++ b/include/Webservices/ConvertLead.php
@@ -8,11 +8,11 @@
* All Rights Reserved.
******************************************************************************** */
+require_once 'vendor/autoload.php';
require_once 'include/Webservices/Retrieve.php';
require_once 'include/Webservices/Create.php';
require_once 'include/Webservices/Delete.php';
require_once 'include/Webservices/DescribeObject.php';
-require_once 'includes/Loader.php';
vimport ('includes.runtime.Globals');
vimport ('includes.runtime.BaseModel');
diff --git a/include/Webservices/ConvertPotential.php b/include/Webservices/ConvertPotential.php
index 8dcd53321e2b69e0d59ef2158b51836c3c23934e..003ca17ceed64c538efd27f33a5808e80f0bb9e0 100644
--- a/include/Webservices/ConvertPotential.php
+++ b/include/Webservices/ConvertPotential.php
@@ -12,7 +12,7 @@ require_once 'include/Webservices/Retrieve.php';
require_once 'include/Webservices/Create.php';
require_once 'include/Webservices/Delete.php';
require_once 'include/Webservices/DescribeObject.php';
-require_once 'includes/Loader.php';
+require_once 'vendor/autoload.php';
vimport('includes.runtime.Globals');
vimport('includes.runtime.BaseModel');
diff --git a/includes/main/WebUI.php b/includes/main/WebUI.php
index 96b79e0d5b78fd4ce20fd10f24b93eaed1fb7d4a..5f9d107eb5e2c0454b27d1344566496264ea6828 100644
--- a/includes/main/WebUI.php
+++ b/includes/main/WebUI.php
@@ -8,10 +8,10 @@
* All Rights Reserved.
************************************************************************************/
+require_once 'vendor/autoload.php';
require_once 'include/utils/utils.php';
require_once 'include/utils/CommonUtils.php';
-require_once 'includes/Loader.php';
vimport ('includes.runtime.EntryPoint');
class Vtiger_WebUI extends Vtiger_EntryPoint {
diff --git a/modules/Emails/actions/TrackAccess.php b/modules/Emails/actions/TrackAccess.php
index 3bc47b129bfe62bd9f0a5a0dd967d24f6ef5818d..42302034edbdb2fcd2131ac98947ad413d690318 100644
--- a/modules/Emails/actions/TrackAccess.php
+++ b/modules/Emails/actions/TrackAccess.php
@@ -16,7 +16,7 @@ header('Cache-Control: private', false);
//Opensource fix for tracking email access count
chdir(dirname(__FILE__). '/../../../');
-require_once 'includes/Loader.php';
+require_once 'vendor/autoload.php';
require_once 'include/utils/utils.php';
vimport('includes.http.Request');
diff --git a/modules/Users/actions/ForgotPassword.php b/modules/Users/actions/ForgotPassword.php
index 721e3262e7b3489aec7c1de4d3cb972c58c1fccf..fb0c263843cb5ca6476ad4c332b3f09f9c83b373 100644
--- a/modules/Users/actions/ForgotPassword.php
+++ b/modules/Users/actions/ForgotPassword.php
@@ -9,9 +9,9 @@
*************************************************************************************/
chdir(dirname(__FILE__)."/../../../");
+include_once "vendor/autoload.php";
include_once "include/utils/VtlibUtils.php";
include_once "include/utils/CommonUtils.php";
-include_once "includes/Loader.php";
include_once 'includes/runtime/BaseModel.php';
include_once 'includes/runtime/Viewer.php';
include_once "includes/http/Request.php";
diff --git a/packages/vtiger/mandatory/Import.zip b/packages/vtiger/mandatory/Import.zip
index cb1d4059b98ea0f7f2ee0f514f5631305737776a..facc92529c29e0d2fca17308eb9e773bb796993a 100644
Binary files a/packages/vtiger/mandatory/Import.zip and b/packages/vtiger/mandatory/Import.zip differ
diff --git a/packages/vtiger/mandatory/MailManager.zip b/packages/vtiger/mandatory/MailManager.zip
index c4ac59cef6901dcd79c3d80575cc90a78856dcad..3deed01f07658554ec3dab6ef83af9414ba67ee9 100644
Binary files a/packages/vtiger/mandatory/MailManager.zip and b/packages/vtiger/mandatory/MailManager.zip differ
diff --git a/packages/vtiger/mandatory/Mobile.zip b/packages/vtiger/mandatory/Mobile.zip
index d3a444ff6c0c04e2a768fcac9409ea478e43ddad..96d4b3c49669fc5bd30f4b3dbfe7e55865479d3b 100644
Binary files a/packages/vtiger/mandatory/Mobile.zip and b/packages/vtiger/mandatory/Mobile.zip differ
diff --git a/packages/vtiger/mandatory/ModTracker.zip b/packages/vtiger/mandatory/ModTracker.zip
index 64c03dec4081a122be9ec4b864a119f832b988cf..8d4a3badcb55710b2eed960dd8ac7c598463c91f 100644
Binary files a/packages/vtiger/mandatory/ModTracker.zip and b/packages/vtiger/mandatory/ModTracker.zip differ
diff --git a/packages/vtiger/mandatory/PBXManager.zip b/packages/vtiger/mandatory/PBXManager.zip
index 21b401926d9230f62e9c1c6419136ac11b98469e..a6267feb056b5de67814d68504aac580959b0243 100644
Binary files a/packages/vtiger/mandatory/PBXManager.zip and b/packages/vtiger/mandatory/PBXManager.zip differ
diff --git a/packages/vtiger/mandatory/ServiceContracts.zip b/packages/vtiger/mandatory/ServiceContracts.zip
index ee0cc78eb13879841481713ae550c01392971a15..e98ec28a30099856bebef3f504e2522696221daf 100644
Binary files a/packages/vtiger/mandatory/ServiceContracts.zip and b/packages/vtiger/mandatory/ServiceContracts.zip differ
diff --git a/packages/vtiger/mandatory/Services.zip b/packages/vtiger/mandatory/Services.zip
index 2705e95c0f4b007dc06c12492d479b40d81a0fc1..aec2c658a8ff74e57fbe8aa49d7f2e301ad6b03a 100644
Binary files a/packages/vtiger/mandatory/Services.zip and b/packages/vtiger/mandatory/Services.zip differ
diff --git a/packages/vtiger/mandatory/WSAPP.zip b/packages/vtiger/mandatory/WSAPP.zip
index 41a173cdb76275270928b99ab94e4715c1b5c2fb..4c57ca0a0a95a542579a2120de744004c542ab1e 100644
Binary files a/packages/vtiger/mandatory/WSAPP.zip and b/packages/vtiger/mandatory/WSAPP.zip differ
diff --git a/packages/vtiger/marketplace/ExtensionStore.zip b/packages/vtiger/marketplace/ExtensionStore.zip
index 6c01d5d791b6d48f914c791901dfb6ebd4422a64..4ce403d0cd1747ca52891a7827d634ebc2e185f1 100644
Binary files a/packages/vtiger/marketplace/ExtensionStore.zip and b/packages/vtiger/marketplace/ExtensionStore.zip differ
diff --git a/packages/vtiger/optional/Arabic_ar_ae.zip b/packages/vtiger/optional/Arabic_ar_ae.zip
index 1d66c8c3431bfb38bf8b0f1500c7b9ffc0a0d1f3..7148db184d056d20b554a747ca1cbf6b6010c72c 100644
Binary files a/packages/vtiger/optional/Arabic_ar_ae.zip and b/packages/vtiger/optional/Arabic_ar_ae.zip differ
diff --git a/packages/vtiger/optional/Assets.zip b/packages/vtiger/optional/Assets.zip
index a49da0137b8e767f4bfedbe643a26c3f40e5de71..c4d50335959b92977e1532a43e54222aa65653d3 100644
Binary files a/packages/vtiger/optional/Assets.zip and b/packages/vtiger/optional/Assets.zip differ
diff --git a/packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip b/packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip
index 1ee858ab829d1cbbacf7d59d8bef45a69d66a28f..ed733fbd7620f08be64a3af3bb3f595cacdd2208 100644
Binary files a/packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip and b/packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip differ
diff --git a/packages/vtiger/optional/BritishLanguagePack_br_br.zip b/packages/vtiger/optional/BritishLanguagePack_br_br.zip
index 01544868df1798f474d934491548d5adb7a3d982..fbccec7716a9fc3d5740047ec49ff890ad70584e 100644
Binary files a/packages/vtiger/optional/BritishLanguagePack_br_br.zip and b/packages/vtiger/optional/BritishLanguagePack_br_br.zip differ
diff --git a/packages/vtiger/optional/CustomerPortal.zip b/packages/vtiger/optional/CustomerPortal.zip
index ef753484a3410d8a0a0b84557b6f77a66d956b68..95c38d83c8c2aa9c3465e0845d0e88942da9de2e 100644
Binary files a/packages/vtiger/optional/CustomerPortal.zip and b/packages/vtiger/optional/CustomerPortal.zip differ
diff --git a/packages/vtiger/optional/Deutsch.zip b/packages/vtiger/optional/Deutsch.zip
index 4d3be95cf14dda6afb43a61378ca6a100d092aa3..4025414a4666ab65afb2b445000d2aaf453e6ea9 100644
Binary files a/packages/vtiger/optional/Deutsch.zip and b/packages/vtiger/optional/Deutsch.zip differ
diff --git a/packages/vtiger/optional/Dutch.zip b/packages/vtiger/optional/Dutch.zip
index ec28af6daf83a436702b5a04d41df17a97189cc5..ea89c027a4bca19544b227cec9f9abc4e0afb564 100644
Binary files a/packages/vtiger/optional/Dutch.zip and b/packages/vtiger/optional/Dutch.zip differ
diff --git a/packages/vtiger/optional/EmailTemplates.zip b/packages/vtiger/optional/EmailTemplates.zip
index 0bebc51fe628e8edf7efd96726f495641d7fb034..3b3cb6d0683e9bf54f6ff102d0325365d415716c 100644
Binary files a/packages/vtiger/optional/EmailTemplates.zip and b/packages/vtiger/optional/EmailTemplates.zip differ
diff --git a/packages/vtiger/optional/French.zip b/packages/vtiger/optional/French.zip
index 6ef3d9d1618e4a0338298a5d421b6d13b2019049..a41625c62bb66db2ecf82fb2cc046e5174518f57 100644
Binary files a/packages/vtiger/optional/French.zip and b/packages/vtiger/optional/French.zip differ
diff --git a/packages/vtiger/optional/Google.zip b/packages/vtiger/optional/Google.zip
index 78c31084bba360f7fb9627377875cfe65f9d20fa..d6b3a6e9e172401dababc4d5668f93afc4ee0e29 100644
Binary files a/packages/vtiger/optional/Google.zip and b/packages/vtiger/optional/Google.zip differ
diff --git a/packages/vtiger/optional/Hungarian.zip b/packages/vtiger/optional/Hungarian.zip
index c500b8ee139daf01fb4a4aead6f9ddd9da883f75..07d70dc5924d0e21bc8380f1f599189feaade131 100644
Binary files a/packages/vtiger/optional/Hungarian.zip and b/packages/vtiger/optional/Hungarian.zip differ
diff --git a/packages/vtiger/optional/ItalianLanguagePack_it_it.zip b/packages/vtiger/optional/ItalianLanguagePack_it_it.zip
index 33a2ed52e8d60465c465009ec0367551d294ba37..a21703afa4c533572713add205aa4e77ec608f4d 100644
Binary files a/packages/vtiger/optional/ItalianLanguagePack_it_it.zip and b/packages/vtiger/optional/ItalianLanguagePack_it_it.zip differ
diff --git a/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip b/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip
index 6e769d617e5c5120e5b86f2d822c5be764be14a8..ce021be417cee597dbcd531494a0a20fd658d269 100644
Binary files a/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip and b/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip differ
diff --git a/packages/vtiger/optional/ModComments.zip b/packages/vtiger/optional/ModComments.zip
index 98d6813252d4064c86f4b010e1c3b8ca188948b6..83987c246124cc855d390a572dd9ce7e12a24973 100644
Binary files a/packages/vtiger/optional/ModComments.zip and b/packages/vtiger/optional/ModComments.zip differ
diff --git a/packages/vtiger/optional/Projects.zip b/packages/vtiger/optional/Projects.zip
index a38d51c7c77466f2a3f04d745ad6bb25e77fab83..70a738b9221ac108e69ffa2137fdbc404264442c 100644
Binary files a/packages/vtiger/optional/Projects.zip and b/packages/vtiger/optional/Projects.zip differ
diff --git a/packages/vtiger/optional/RecycleBin.zip b/packages/vtiger/optional/RecycleBin.zip
index f344323ce336a08e0e2b577b3f58b240cb409af6..fe03be4c86e6507107788029e06da55dab2a0ba6 100644
Binary files a/packages/vtiger/optional/RecycleBin.zip and b/packages/vtiger/optional/RecycleBin.zip differ
diff --git a/packages/vtiger/optional/SMSNotifier.zip b/packages/vtiger/optional/SMSNotifier.zip
index 925c97f91414ae61a3cbb9bd24e08ac500387fd8..773e2ed348ced132a2d42c6cf0a116eb155e951c 100644
Binary files a/packages/vtiger/optional/SMSNotifier.zip and b/packages/vtiger/optional/SMSNotifier.zip differ
diff --git a/packages/vtiger/optional/Spanish.zip b/packages/vtiger/optional/Spanish.zip
index 392bf04fbd46ec44b39895a3aaa9f8c1d093befb..b6be8d9c39922badb9154658fefe7fd3332aca73 100644
Binary files a/packages/vtiger/optional/Spanish.zip and b/packages/vtiger/optional/Spanish.zip differ
diff --git a/packages/vtiger/optional/Sweden_sv_se.zip b/packages/vtiger/optional/Sweden_sv_se.zip
index 42a0daae26eb7b18431f12144efc6dfd3f18e208..3e1048f36a6c93094c9e94c3aa1dc654cc68b6b5 100644
Binary files a/packages/vtiger/optional/Sweden_sv_se.zip and b/packages/vtiger/optional/Sweden_sv_se.zip differ
diff --git a/packages/vtiger/optional/Webforms.zip b/packages/vtiger/optional/Webforms.zip
index 7e4411a542c08688aaee274fc43918a887378008..2435fc1e64305358062ebc586335e0a0081917fb 100644
Binary files a/packages/vtiger/optional/Webforms.zip and b/packages/vtiger/optional/Webforms.zip differ
diff --git a/pkg/vtiger/modules/CustomerPortal/modules/CustomerPortal/include.inc b/pkg/vtiger/modules/CustomerPortal/modules/CustomerPortal/include.inc
index cde1f67820cc8ddb56e69c48c3401ab6d7b140ce..cca76ea5521c2d2b5f8dc1b070ba423f9371481b 100644
--- a/pkg/vtiger/modules/CustomerPortal/modules/CustomerPortal/include.inc
+++ b/pkg/vtiger/modules/CustomerPortal/modules/CustomerPortal/include.inc
@@ -11,7 +11,6 @@
chdir(dirname(__FILE__).'/../../');
require_once 'vendor/autoload.php';
-include_once 'includes/Loader.php';
include_once 'includes/runtime/Globals.php';
include_once 'include/Webservices/Relation.php';
require_once 'include/utils/utils.php';
diff --git a/pkg/vtiger/modules/Import/cron/ScheduledImport.service b/pkg/vtiger/modules/Import/cron/ScheduledImport.service
index 6832fd37af19c9739b843417eb4d0b5c471fbdd4..39de064ad88d050d15d893cad0d7f10aee9dd719 100644
--- a/pkg/vtiger/modules/Import/cron/ScheduledImport.service
+++ b/pkg/vtiger/modules/Import/cron/ScheduledImport.service
@@ -12,7 +12,7 @@
$previousBulkSaveMode = $VTIGER_BULK_SAVE_MODE;
$VTIGER_BULK_SAVE_MODE = true;
-require_once 'includes/Loader.php';
+require_once 'vendor/autoload.php';
require_once 'includes/runtime/Controller.php';
require_once 'includes/runtime/BaseModel.php';
require_once 'includes/runtime/Globals.php';
diff --git a/pkg/vtiger/modules/Mobile/modules/Mobile/html/Viewer.php b/pkg/vtiger/modules/Mobile/modules/Mobile/html/Viewer.php
index c0105147b88a658d37dec21f74dc00a3fa1e9123..e1a388fb5fed7746a17b056269784126735a175a 100644
--- a/pkg/vtiger/modules/Mobile/modules/Mobile/html/Viewer.php
+++ b/pkg/vtiger/modules/Mobile/modules/Mobile/html/Viewer.php
@@ -8,7 +8,7 @@
* All Rights Reserved.
************************************************************************************/
-include_once 'includes/Loader.php';
+include_once 'vendor/autoload.php';
include_once 'includes/runtime/Viewer.php';
class Mobile_HTML_Viewer extends Vtiger_Viewer{
diff --git a/pkg/vtiger/modules/Webforms/modules/Webforms/capture.php b/pkg/vtiger/modules/Webforms/modules/Webforms/capture.php
index f574bf5edbfdae2905440731d606acab5afdffee..33c375af2d9fee33c69f8d57c990b481eb84b7dd 100644
--- a/pkg/vtiger/modules/Webforms/modules/Webforms/capture.php
+++ b/pkg/vtiger/modules/Webforms/modules/Webforms/capture.php
@@ -10,7 +10,7 @@
// Switch the working directory to base
chdir(dirname(__FILE__) . '/../..');
-require_once 'includes/Loader.php';
+require_once 'vendor/autoload.php';
require_once 'include/Zend/Json.php';
require_once 'vtlib/Vtiger/Module.php';
require_once 'include/utils/VtlibUtils.php';
diff --git a/public.php b/public.php
index 337bb0cf99b6eb53470916c96c5c207bec1ad5d2..73d4effeb032faaafc8b6af3433cacead034c901 100644
--- a/public.php
+++ b/public.php
@@ -8,8 +8,8 @@
* All Rights Reserved.
*************************************************************************************/
+include_once 'vendor/autoload.php';
include_once 'vtlib/Vtiger/Module.php';
-include_once 'includes/Loader.php';
vimport('includes.runtime.EntryPoint');
-Vtiger_ShowFile_Helper::handle(vtlib_purify($_REQUEST['fid']), vtlib_purify($_REQUEST['key']));
\ No newline at end of file
+Vtiger_ShowFile_Helper::handle(vtlib_purify($_REQUEST['fid']), vtlib_purify($_REQUEST['key']));
diff --git a/shorturl.php b/shorturl.php
index 90bb330df82ba4db35f96c1b095f091d18b06115..ef0dfbe8c164dfced74daeafe46ea148a7b6b406 100644
--- a/shorturl.php
+++ b/shorturl.php
@@ -8,13 +8,14 @@
* All Rights Reserved.
*************************************************************************************/
+include_once dirname(__FILE__) . '/vendor/autoload.php';
+
//Overrides GetRelatedList : used to get related query
//TODO : Eliminate below hacking solution
include_once 'include/Webservices/Relation.php';
include_once 'vtlib/Vtiger/Module.php';
-include_once dirname(__FILE__) . '/includes/Loader.php';
vimport ('includes.runtime.EntryPoint');
-Vtiger_ShortURL_Helper::handle(vtlib_purify($_REQUEST['id']));
\ No newline at end of file
+Vtiger_ShortURL_Helper::handle(vtlib_purify($_REQUEST['id']));
diff --git a/vtigercron.php b/vtigercron.php
index 886ae0bd131a1d10df00322f86d3705de06fb0d5..c71305311b03c8a1c954f4ff06c1fd1d73d5cead 100644
--- a/vtigercron.php
+++ b/vtigercron.php
@@ -20,7 +20,7 @@ if (file_exists('config_override.php')) {
}
// Extended inclusions
-require_once 'includes/Loader.php';
+require_once 'vendor/autoload.php';
vimport ('includes.runtime.EntryPoint');
$site_URLArray = explode('/',$site_URL);