diff --git a/.phpstorm.meta.php/magento_blocks.meta.php b/.phpstorm.meta.php/magento_blocks.meta.php
index 6923d7a7b56..1062c588fe0 100644
--- a/.phpstorm.meta.php/magento_blocks.meta.php
+++ b/.phpstorm.meta.php/magento_blocks.meta.php
@@ -291,10 +291,11 @@
             'adminhtml/permissions_edituser' => \Mage_Adminhtml_Block_Permissions_Edituser::class,
             'adminhtml/permissions_grid_role' => \Mage_Adminhtml_Block_Permissions_Grid_Role::class,
             'adminhtml/permissions_grid_user' => \Mage_Adminhtml_Block_Permissions_Grid_User::class,
+            'adminhtml/permissions_orphanedResource' => \Mage_Adminhtml_Block_Permissions_OrphanedResource::class,
+            'adminhtml/permissions_orphanedResource_grid' => \Mage_Adminhtml_Block_Permissions_OrphanedResource_Grid::class,
             'adminhtml/permissions_role' => \Mage_Adminhtml_Block_Permissions_Role::class,
             'adminhtml/permissions_role_grid_user' => \Mage_Adminhtml_Block_Permissions_Role_Grid_User::class,
             'adminhtml/permissions_roles' => \Mage_Adminhtml_Block_Permissions_Roles::class,
-            'adminhtml/permissions_orphanedResource' => \Mage_Adminhtml_Block_Permissions_OrphanedResource::class,
             'adminhtml/permissions_tab_roleinfo' => \Mage_Adminhtml_Block_Permissions_Tab_Roleinfo::class,
             'adminhtml/permissions_tab_rolesedit' => \Mage_Adminhtml_Block_Permissions_Tab_Rolesedit::class,
             'adminhtml/permissions_tab_rolesusers' => \Mage_Adminhtml_Block_Permissions_Tab_Rolesusers::class,
diff --git a/.phpstorm.meta.php/magento_blocks_methods.meta.php b/.phpstorm.meta.php/magento_blocks_methods.meta.php
index bb0f06ba1d5..78705cf0284 100644
--- a/.phpstorm.meta.php/magento_blocks_methods.meta.php
+++ b/.phpstorm.meta.php/magento_blocks_methods.meta.php
@@ -291,10 +291,11 @@
             'adminhtml/permissions_edituser' => \Mage_Adminhtml_Block_Permissions_Edituser::class,
             'adminhtml/permissions_grid_role' => \Mage_Adminhtml_Block_Permissions_Grid_Role::class,
             'adminhtml/permissions_grid_user' => \Mage_Adminhtml_Block_Permissions_Grid_User::class,
+            'adminhtml/permissions_orphanedResource' => \Mage_Adminhtml_Block_Permissions_OrphanedResource::class,
+            'adminhtml/permissions_orphanedResource_grid' => \Mage_Adminhtml_Block_Permissions_OrphanedResource_Grid::class,
             'adminhtml/permissions_role' => \Mage_Adminhtml_Block_Permissions_Role::class,
             'adminhtml/permissions_role_grid_user' => \Mage_Adminhtml_Block_Permissions_Role_Grid_User::class,
             'adminhtml/permissions_roles' => \Mage_Adminhtml_Block_Permissions_Roles::class,
-            'adminhtml/permissions_orphanedResource' => \Mage_Adminhtml_Block_Permissions_OrphanedResource::class,
             'adminhtml/permissions_tab_roleinfo' => \Mage_Adminhtml_Block_Permissions_Tab_Roleinfo::class,
             'adminhtml/permissions_tab_rolesedit' => \Mage_Adminhtml_Block_Permissions_Tab_Rolesedit::class,
             'adminhtml/permissions_tab_rolesusers' => \Mage_Adminhtml_Block_Permissions_Tab_Rolesusers::class,
@@ -555,7 +556,6 @@
             'adminhtml/sales_order_view_tab_history' => \Mage_Adminhtml_Block_Sales_Order_View_Tab_History::class,
             'adminhtml/sales_order_view_tab_info' => \Mage_Adminhtml_Block_Sales_Order_View_Tab_Info::class,
             'adminhtml/sales_order_view_tab_invoices' => \Mage_Adminhtml_Block_Sales_Order_View_Tab_Invoices::class,
-            'adminhtml/sales_order_view_tab_prova' => \Mage_Adminhtml_Block_Sales_Order_View_Tab_Prova::class,
             'adminhtml/sales_order_view_tab_shipments' => \Mage_Adminhtml_Block_Sales_Order_View_Tab_Shipments::class,
             'adminhtml/sales_order_view_tab_transactions' => \Mage_Adminhtml_Block_Sales_Order_View_Tab_Transactions::class,
             'adminhtml/sales_order_view_tabs' => \Mage_Adminhtml_Block_Sales_Order_View_Tabs::class,
diff --git a/.phpstorm.meta.php/magento_helpers.meta.php b/.phpstorm.meta.php/magento_helpers.meta.php
index cff3a423226..732f3a1af1a 100644
--- a/.phpstorm.meta.php/magento_helpers.meta.php
+++ b/.phpstorm.meta.php/magento_helpers.meta.php
@@ -83,6 +83,7 @@
             'core/cookie' => \Mage_Core_Helper_Cookie::class,
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
+            'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
diff --git a/.phpstorm.meta.php/magento_helpers_methods.meta.php b/.phpstorm.meta.php/magento_helpers_methods.meta.php
index 1be95297142..507cd30a59f 100644
--- a/.phpstorm.meta.php/magento_helpers_methods.meta.php
+++ b/.phpstorm.meta.php/magento_helpers_methods.meta.php
@@ -83,6 +83,7 @@
             'core/cookie' => \Mage_Core_Helper_Cookie::class,
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
+            'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -274,6 +275,7 @@
             'core/cookie' => \Mage_Core_Helper_Cookie::class,
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
+            'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -465,6 +467,7 @@
             'core/cookie' => \Mage_Core_Helper_Cookie::class,
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
+            'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -656,6 +659,7 @@
             'core/cookie' => \Mage_Core_Helper_Cookie::class,
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
+            'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -847,6 +851,7 @@
             'core/cookie' => \Mage_Core_Helper_Cookie::class,
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
+            'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -1038,6 +1043,7 @@
             'core/cookie' => \Mage_Core_Helper_Cookie::class,
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
+            'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -1229,6 +1235,7 @@
             'core/cookie' => \Mage_Core_Helper_Cookie::class,
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
+            'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -1420,6 +1427,7 @@
             'core/cookie' => \Mage_Core_Helper_Cookie::class,
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
+            'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -1611,6 +1619,7 @@
             'core/cookie' => \Mage_Core_Helper_Cookie::class,
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
+            'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -1802,6 +1811,7 @@
             'core/cookie' => \Mage_Core_Helper_Cookie::class,
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
+            'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -1993,6 +2003,7 @@
             'core/cookie' => \Mage_Core_Helper_Cookie::class,
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
+            'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -2184,6 +2195,7 @@
             'core/cookie' => \Mage_Core_Helper_Cookie::class,
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
+            'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -2375,6 +2387,7 @@
             'core/cookie' => \Mage_Core_Helper_Cookie::class,
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
+            'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -2566,6 +2579,7 @@
             'core/cookie' => \Mage_Core_Helper_Cookie::class,
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
+            'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -2757,6 +2771,7 @@
             'core/cookie' => \Mage_Core_Helper_Cookie::class,
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
+            'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
@@ -2948,6 +2963,7 @@
             'core/cookie' => \Mage_Core_Helper_Cookie::class,
             'core' => \Mage_Core_Helper_Data::class,
             'core/data' => \Mage_Core_Helper_Data::class,
+            'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
             'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
             'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
             'core/hint' => \Mage_Core_Helper_Hint::class,
diff --git a/.phpstorm.meta.php/magento_models.meta.php b/.phpstorm.meta.php/magento_models.meta.php
index a36c2a78901..264618b77c4 100644
--- a/.phpstorm.meta.php/magento_models.meta.php
+++ b/.phpstorm.meta.php/magento_models.meta.php
@@ -2,11 +2,6 @@
 namespace PHPSTORM_META {
     override( \Mage::getModel(0),
         map( [
-            'core_resource/session' => \Cm_RedisSession_Model_Session::class,
-            'cm_redissession/session' => \Cm_RedisSession_Model_Session::class,
-            'cm_redissession/session_config' => \Cm_RedisSession_Model_Session_Config::class,
-            'cm_redissession/session_handler' => \Cm_RedisSession_Model_Session_Handler::class,
-            'cm_redissession/session_logger' => \Cm_RedisSession_Model_Session_Logger::class,
             'adminnotification/feed' => \Mage_AdminNotification_Model_Feed::class,
             'adminnotification/inbox' => \Mage_AdminNotification_Model_Inbox::class,
             'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class,
@@ -1231,6 +1226,7 @@
             'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
             'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
             'core/resource_session' => \Mage_Core_Model_Resource_Session::class,
+            'core_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'payment_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class,
             'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
@@ -1631,6 +1627,7 @@
             'eav/entity_attribute_frontend_default' => \Mage_Eav_Model_Entity_Attribute_Frontend_Default::class,
             'eav/entity_attribute_group' => \Mage_Eav_Model_Entity_Attribute_Group::class,
             'eav/entity_attribute_option' => \Mage_Eav_Model_Entity_Attribute_Option::class,
+            'eav/entity_attribute_option_swatch' => \Mage_Eav_Model_Entity_Attribute_Option_Swatch::class,
             'eav/entity_attribute_set' => \Mage_Eav_Model_Entity_Attribute_Set::class,
             'eav/entity_attribute_source_abstract' => \Mage_Eav_Model_Entity_Attribute_Source_Abstract::class,
             'eav/entity_attribute_source_boolean' => \Mage_Eav_Model_Entity_Attribute_Source_Boolean::class,
@@ -1686,6 +1683,8 @@
             'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
             'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
             'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
+            'eav/resource_entity_attribute_option_swatch' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Swatch::class,
+            'eav_resource/entity_attribute_option_swatch' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Swatch::class,
             'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
@@ -3086,6 +3085,7 @@
             'usa/shipping_carrier_fedex_source_packaging' => \Mage_Usa_Model_Shipping_Carrier_Fedex_Source_Packaging::class,
             'usa/shipping_carrier_fedex_source_unitofmeasure' => \Mage_Usa_Model_Shipping_Carrier_Fedex_Source_Unitofmeasure::class,
             'usa/shipping_carrier_ups' => \Mage_Usa_Model_Shipping_Carrier_Ups::class,
+            'usa/shipping_carrier_upsAuth' => \Mage_Usa_Model_Shipping_Carrier_UpsAuth::class,
             'usa/shipping_carrier_ups_backend_freemethod' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_Freemethod::class,
             'usa/shipping_carrier_ups_backend_originShipment' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_OriginShipment::class,
             'usa/shipping_carrier_ups_backend_type' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_Type::class,
@@ -3168,11 +3168,6 @@
     );
     override( \Mage::getSingleton(0),
         map( [
-            'core_resource/session' => \Cm_RedisSession_Model_Session::class,
-            'cm_redissession/session' => \Cm_RedisSession_Model_Session::class,
-            'cm_redissession/session_config' => \Cm_RedisSession_Model_Session_Config::class,
-            'cm_redissession/session_handler' => \Cm_RedisSession_Model_Session_Handler::class,
-            'cm_redissession/session_logger' => \Cm_RedisSession_Model_Session_Logger::class,
             'adminnotification/feed' => \Mage_AdminNotification_Model_Feed::class,
             'adminnotification/inbox' => \Mage_AdminNotification_Model_Inbox::class,
             'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class,
@@ -4397,6 +4392,7 @@
             'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
             'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
             'core/resource_session' => \Mage_Core_Model_Resource_Session::class,
+            'core_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'payment_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class,
             'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
@@ -4797,6 +4793,7 @@
             'eav/entity_attribute_frontend_default' => \Mage_Eav_Model_Entity_Attribute_Frontend_Default::class,
             'eav/entity_attribute_group' => \Mage_Eav_Model_Entity_Attribute_Group::class,
             'eav/entity_attribute_option' => \Mage_Eav_Model_Entity_Attribute_Option::class,
+            'eav/entity_attribute_option_swatch' => \Mage_Eav_Model_Entity_Attribute_Option_Swatch::class,
             'eav/entity_attribute_set' => \Mage_Eav_Model_Entity_Attribute_Set::class,
             'eav/entity_attribute_source_abstract' => \Mage_Eav_Model_Entity_Attribute_Source_Abstract::class,
             'eav/entity_attribute_source_boolean' => \Mage_Eav_Model_Entity_Attribute_Source_Boolean::class,
@@ -4852,6 +4849,8 @@
             'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
             'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
             'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
+            'eav/resource_entity_attribute_option_swatch' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Swatch::class,
+            'eav_resource/entity_attribute_option_swatch' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Swatch::class,
             'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
@@ -6252,6 +6251,7 @@
             'usa/shipping_carrier_fedex_source_packaging' => \Mage_Usa_Model_Shipping_Carrier_Fedex_Source_Packaging::class,
             'usa/shipping_carrier_fedex_source_unitofmeasure' => \Mage_Usa_Model_Shipping_Carrier_Fedex_Source_Unitofmeasure::class,
             'usa/shipping_carrier_ups' => \Mage_Usa_Model_Shipping_Carrier_Ups::class,
+            'usa/shipping_carrier_upsAuth' => \Mage_Usa_Model_Shipping_Carrier_UpsAuth::class,
             'usa/shipping_carrier_ups_backend_freemethod' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_Freemethod::class,
             'usa/shipping_carrier_ups_backend_originShipment' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_OriginShipment::class,
             'usa/shipping_carrier_ups_backend_type' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_Type::class,
diff --git a/.phpstorm.meta.php/magento_models_methods.meta.php b/.phpstorm.meta.php/magento_models_methods.meta.php
index a4440b3c7bb..d3763a8cceb 100644
--- a/.phpstorm.meta.php/magento_models_methods.meta.php
+++ b/.phpstorm.meta.php/magento_models_methods.meta.php
@@ -2,11 +2,6 @@
 namespace PHPSTORM_META {
     override( \Mage_Adminhtml_Tax_RuleController::_getSingletonModel(0),
         map( [
-            'core_resource/session' => \Cm_RedisSession_Model_Session::class,
-            'cm_redissession/session' => \Cm_RedisSession_Model_Session::class,
-            'cm_redissession/session_config' => \Cm_RedisSession_Model_Session_Config::class,
-            'cm_redissession/session_handler' => \Cm_RedisSession_Model_Session_Handler::class,
-            'cm_redissession/session_logger' => \Cm_RedisSession_Model_Session_Logger::class,
             'adminnotification/feed' => \Mage_AdminNotification_Model_Feed::class,
             'adminnotification/inbox' => \Mage_AdminNotification_Model_Inbox::class,
             'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class,
@@ -1231,6 +1226,7 @@
             'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
             'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
             'core/resource_session' => \Mage_Core_Model_Resource_Session::class,
+            'core_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'payment_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class,
             'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
@@ -1631,6 +1627,7 @@
             'eav/entity_attribute_frontend_default' => \Mage_Eav_Model_Entity_Attribute_Frontend_Default::class,
             'eav/entity_attribute_group' => \Mage_Eav_Model_Entity_Attribute_Group::class,
             'eav/entity_attribute_option' => \Mage_Eav_Model_Entity_Attribute_Option::class,
+            'eav/entity_attribute_option_swatch' => \Mage_Eav_Model_Entity_Attribute_Option_Swatch::class,
             'eav/entity_attribute_set' => \Mage_Eav_Model_Entity_Attribute_Set::class,
             'eav/entity_attribute_source_abstract' => \Mage_Eav_Model_Entity_Attribute_Source_Abstract::class,
             'eav/entity_attribute_source_boolean' => \Mage_Eav_Model_Entity_Attribute_Source_Boolean::class,
@@ -1686,6 +1683,8 @@
             'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
             'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
             'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
+            'eav/resource_entity_attribute_option_swatch' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Swatch::class,
+            'eav_resource/entity_attribute_option_swatch' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Swatch::class,
             'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
@@ -3086,6 +3085,7 @@
             'usa/shipping_carrier_fedex_source_packaging' => \Mage_Usa_Model_Shipping_Carrier_Fedex_Source_Packaging::class,
             'usa/shipping_carrier_fedex_source_unitofmeasure' => \Mage_Usa_Model_Shipping_Carrier_Fedex_Source_Unitofmeasure::class,
             'usa/shipping_carrier_ups' => \Mage_Usa_Model_Shipping_Carrier_Ups::class,
+            'usa/shipping_carrier_upsAuth' => \Mage_Usa_Model_Shipping_Carrier_UpsAuth::class,
             'usa/shipping_carrier_ups_backend_freemethod' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_Freemethod::class,
             'usa/shipping_carrier_ups_backend_originShipment' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_OriginShipment::class,
             'usa/shipping_carrier_ups_backend_type' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_Type::class,
@@ -3168,11 +3168,6 @@
     );
     override( \Mage_Catalog_Block_Product_Abstract::_getSingletonModel(0),
         map( [
-            'core_resource/session' => \Cm_RedisSession_Model_Session::class,
-            'cm_redissession/session' => \Cm_RedisSession_Model_Session::class,
-            'cm_redissession/session_config' => \Cm_RedisSession_Model_Session_Config::class,
-            'cm_redissession/session_handler' => \Cm_RedisSession_Model_Session_Handler::class,
-            'cm_redissession/session_logger' => \Cm_RedisSession_Model_Session_Logger::class,
             'adminnotification/feed' => \Mage_AdminNotification_Model_Feed::class,
             'adminnotification/inbox' => \Mage_AdminNotification_Model_Inbox::class,
             'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class,
@@ -4397,6 +4392,7 @@
             'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
             'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
             'core/resource_session' => \Mage_Core_Model_Resource_Session::class,
+            'core_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'payment_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class,
             'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
@@ -4797,6 +4793,7 @@
             'eav/entity_attribute_frontend_default' => \Mage_Eav_Model_Entity_Attribute_Frontend_Default::class,
             'eav/entity_attribute_group' => \Mage_Eav_Model_Entity_Attribute_Group::class,
             'eav/entity_attribute_option' => \Mage_Eav_Model_Entity_Attribute_Option::class,
+            'eav/entity_attribute_option_swatch' => \Mage_Eav_Model_Entity_Attribute_Option_Swatch::class,
             'eav/entity_attribute_set' => \Mage_Eav_Model_Entity_Attribute_Set::class,
             'eav/entity_attribute_source_abstract' => \Mage_Eav_Model_Entity_Attribute_Source_Abstract::class,
             'eav/entity_attribute_source_boolean' => \Mage_Eav_Model_Entity_Attribute_Source_Boolean::class,
@@ -4852,6 +4849,8 @@
             'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
             'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
             'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
+            'eav/resource_entity_attribute_option_swatch' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Swatch::class,
+            'eav_resource/entity_attribute_option_swatch' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Swatch::class,
             'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
@@ -6252,6 +6251,7 @@
             'usa/shipping_carrier_fedex_source_packaging' => \Mage_Usa_Model_Shipping_Carrier_Fedex_Source_Packaging::class,
             'usa/shipping_carrier_fedex_source_unitofmeasure' => \Mage_Usa_Model_Shipping_Carrier_Fedex_Source_Unitofmeasure::class,
             'usa/shipping_carrier_ups' => \Mage_Usa_Model_Shipping_Carrier_Ups::class,
+            'usa/shipping_carrier_upsAuth' => \Mage_Usa_Model_Shipping_Carrier_UpsAuth::class,
             'usa/shipping_carrier_ups_backend_freemethod' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_Freemethod::class,
             'usa/shipping_carrier_ups_backend_originShipment' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_OriginShipment::class,
             'usa/shipping_carrier_ups_backend_type' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_Type::class,
@@ -6334,11 +6334,6 @@
     );
     override( \Mage_Checkout_Helper_Cart::_getSingletonModel(0),
         map( [
-            'core_resource/session' => \Cm_RedisSession_Model_Session::class,
-            'cm_redissession/session' => \Cm_RedisSession_Model_Session::class,
-            'cm_redissession/session_config' => \Cm_RedisSession_Model_Session_Config::class,
-            'cm_redissession/session_handler' => \Cm_RedisSession_Model_Session_Handler::class,
-            'cm_redissession/session_logger' => \Cm_RedisSession_Model_Session_Logger::class,
             'adminnotification/feed' => \Mage_AdminNotification_Model_Feed::class,
             'adminnotification/inbox' => \Mage_AdminNotification_Model_Inbox::class,
             'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class,
@@ -7563,6 +7558,7 @@
             'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
             'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
             'core/resource_session' => \Mage_Core_Model_Resource_Session::class,
+            'core_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'payment_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class,
             'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
@@ -7963,6 +7959,7 @@
             'eav/entity_attribute_frontend_default' => \Mage_Eav_Model_Entity_Attribute_Frontend_Default::class,
             'eav/entity_attribute_group' => \Mage_Eav_Model_Entity_Attribute_Group::class,
             'eav/entity_attribute_option' => \Mage_Eav_Model_Entity_Attribute_Option::class,
+            'eav/entity_attribute_option_swatch' => \Mage_Eav_Model_Entity_Attribute_Option_Swatch::class,
             'eav/entity_attribute_set' => \Mage_Eav_Model_Entity_Attribute_Set::class,
             'eav/entity_attribute_source_abstract' => \Mage_Eav_Model_Entity_Attribute_Source_Abstract::class,
             'eav/entity_attribute_source_boolean' => \Mage_Eav_Model_Entity_Attribute_Source_Boolean::class,
@@ -8018,6 +8015,8 @@
             'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
             'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
             'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
+            'eav/resource_entity_attribute_option_swatch' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Swatch::class,
+            'eav_resource/entity_attribute_option_swatch' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Swatch::class,
             'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
@@ -9418,6 +9417,7 @@
             'usa/shipping_carrier_fedex_source_packaging' => \Mage_Usa_Model_Shipping_Carrier_Fedex_Source_Packaging::class,
             'usa/shipping_carrier_fedex_source_unitofmeasure' => \Mage_Usa_Model_Shipping_Carrier_Fedex_Source_Unitofmeasure::class,
             'usa/shipping_carrier_ups' => \Mage_Usa_Model_Shipping_Carrier_Ups::class,
+            'usa/shipping_carrier_upsAuth' => \Mage_Usa_Model_Shipping_Carrier_UpsAuth::class,
             'usa/shipping_carrier_ups_backend_freemethod' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_Freemethod::class,
             'usa/shipping_carrier_ups_backend_originShipment' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_OriginShipment::class,
             'usa/shipping_carrier_ups_backend_type' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_Type::class,
@@ -9500,11 +9500,6 @@
     );
     override( \Mage_Core_Model_Factory::getModel(0),
         map( [
-            'core_resource/session' => \Cm_RedisSession_Model_Session::class,
-            'cm_redissession/session' => \Cm_RedisSession_Model_Session::class,
-            'cm_redissession/session_config' => \Cm_RedisSession_Model_Session_Config::class,
-            'cm_redissession/session_handler' => \Cm_RedisSession_Model_Session_Handler::class,
-            'cm_redissession/session_logger' => \Cm_RedisSession_Model_Session_Logger::class,
             'adminnotification/feed' => \Mage_AdminNotification_Model_Feed::class,
             'adminnotification/inbox' => \Mage_AdminNotification_Model_Inbox::class,
             'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class,
@@ -10729,6 +10724,7 @@
             'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
             'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
             'core/resource_session' => \Mage_Core_Model_Resource_Session::class,
+            'core_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'payment_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class,
             'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
@@ -11129,6 +11125,7 @@
             'eav/entity_attribute_frontend_default' => \Mage_Eav_Model_Entity_Attribute_Frontend_Default::class,
             'eav/entity_attribute_group' => \Mage_Eav_Model_Entity_Attribute_Group::class,
             'eav/entity_attribute_option' => \Mage_Eav_Model_Entity_Attribute_Option::class,
+            'eav/entity_attribute_option_swatch' => \Mage_Eav_Model_Entity_Attribute_Option_Swatch::class,
             'eav/entity_attribute_set' => \Mage_Eav_Model_Entity_Attribute_Set::class,
             'eav/entity_attribute_source_abstract' => \Mage_Eav_Model_Entity_Attribute_Source_Abstract::class,
             'eav/entity_attribute_source_boolean' => \Mage_Eav_Model_Entity_Attribute_Source_Boolean::class,
@@ -11184,6 +11181,8 @@
             'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
             'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
             'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
+            'eav/resource_entity_attribute_option_swatch' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Swatch::class,
+            'eav_resource/entity_attribute_option_swatch' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Swatch::class,
             'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
@@ -12584,6 +12583,7 @@
             'usa/shipping_carrier_fedex_source_packaging' => \Mage_Usa_Model_Shipping_Carrier_Fedex_Source_Packaging::class,
             'usa/shipping_carrier_fedex_source_unitofmeasure' => \Mage_Usa_Model_Shipping_Carrier_Fedex_Source_Unitofmeasure::class,
             'usa/shipping_carrier_ups' => \Mage_Usa_Model_Shipping_Carrier_Ups::class,
+            'usa/shipping_carrier_upsAuth' => \Mage_Usa_Model_Shipping_Carrier_UpsAuth::class,
             'usa/shipping_carrier_ups_backend_freemethod' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_Freemethod::class,
             'usa/shipping_carrier_ups_backend_originShipment' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_OriginShipment::class,
             'usa/shipping_carrier_ups_backend_type' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_Type::class,
@@ -12666,11 +12666,6 @@
     );
     override( \Mage_Core_Model_Factory::getSingleton(0),
         map( [
-            'core_resource/session' => \Cm_RedisSession_Model_Session::class,
-            'cm_redissession/session' => \Cm_RedisSession_Model_Session::class,
-            'cm_redissession/session_config' => \Cm_RedisSession_Model_Session_Config::class,
-            'cm_redissession/session_handler' => \Cm_RedisSession_Model_Session_Handler::class,
-            'cm_redissession/session_logger' => \Cm_RedisSession_Model_Session_Logger::class,
             'adminnotification/feed' => \Mage_AdminNotification_Model_Feed::class,
             'adminnotification/inbox' => \Mage_AdminNotification_Model_Inbox::class,
             'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class,
@@ -13895,6 +13890,7 @@
             'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
             'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
             'core/resource_session' => \Mage_Core_Model_Resource_Session::class,
+            'core_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'payment_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class,
             'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
@@ -14295,6 +14291,7 @@
             'eav/entity_attribute_frontend_default' => \Mage_Eav_Model_Entity_Attribute_Frontend_Default::class,
             'eav/entity_attribute_group' => \Mage_Eav_Model_Entity_Attribute_Group::class,
             'eav/entity_attribute_option' => \Mage_Eav_Model_Entity_Attribute_Option::class,
+            'eav/entity_attribute_option_swatch' => \Mage_Eav_Model_Entity_Attribute_Option_Swatch::class,
             'eav/entity_attribute_set' => \Mage_Eav_Model_Entity_Attribute_Set::class,
             'eav/entity_attribute_source_abstract' => \Mage_Eav_Model_Entity_Attribute_Source_Abstract::class,
             'eav/entity_attribute_source_boolean' => \Mage_Eav_Model_Entity_Attribute_Source_Boolean::class,
@@ -14350,6 +14347,8 @@
             'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
             'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
             'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
+            'eav/resource_entity_attribute_option_swatch' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Swatch::class,
+            'eav_resource/entity_attribute_option_swatch' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Swatch::class,
             'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
@@ -15750,6 +15749,7 @@
             'usa/shipping_carrier_fedex_source_packaging' => \Mage_Usa_Model_Shipping_Carrier_Fedex_Source_Packaging::class,
             'usa/shipping_carrier_fedex_source_unitofmeasure' => \Mage_Usa_Model_Shipping_Carrier_Fedex_Source_Unitofmeasure::class,
             'usa/shipping_carrier_ups' => \Mage_Usa_Model_Shipping_Carrier_Ups::class,
+            'usa/shipping_carrier_upsAuth' => \Mage_Usa_Model_Shipping_Carrier_UpsAuth::class,
             'usa/shipping_carrier_ups_backend_freemethod' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_Freemethod::class,
             'usa/shipping_carrier_ups_backend_originShipment' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_OriginShipment::class,
             'usa/shipping_carrier_ups_backend_type' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_Type::class,
@@ -15832,11 +15832,6 @@
     );
     override( \Mage_Customer_AccountController::_getModel(0),
         map( [
-            'core_resource/session' => \Cm_RedisSession_Model_Session::class,
-            'cm_redissession/session' => \Cm_RedisSession_Model_Session::class,
-            'cm_redissession/session_config' => \Cm_RedisSession_Model_Session_Config::class,
-            'cm_redissession/session_handler' => \Cm_RedisSession_Model_Session_Handler::class,
-            'cm_redissession/session_logger' => \Cm_RedisSession_Model_Session_Logger::class,
             'adminnotification/feed' => \Mage_AdminNotification_Model_Feed::class,
             'adminnotification/inbox' => \Mage_AdminNotification_Model_Inbox::class,
             'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class,
@@ -17061,6 +17056,7 @@
             'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
             'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
             'core/resource_session' => \Mage_Core_Model_Resource_Session::class,
+            'core_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'payment_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class,
             'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
@@ -17461,6 +17457,7 @@
             'eav/entity_attribute_frontend_default' => \Mage_Eav_Model_Entity_Attribute_Frontend_Default::class,
             'eav/entity_attribute_group' => \Mage_Eav_Model_Entity_Attribute_Group::class,
             'eav/entity_attribute_option' => \Mage_Eav_Model_Entity_Attribute_Option::class,
+            'eav/entity_attribute_option_swatch' => \Mage_Eav_Model_Entity_Attribute_Option_Swatch::class,
             'eav/entity_attribute_set' => \Mage_Eav_Model_Entity_Attribute_Set::class,
             'eav/entity_attribute_source_abstract' => \Mage_Eav_Model_Entity_Attribute_Source_Abstract::class,
             'eav/entity_attribute_source_boolean' => \Mage_Eav_Model_Entity_Attribute_Source_Boolean::class,
@@ -17516,6 +17513,8 @@
             'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
             'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
             'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
+            'eav/resource_entity_attribute_option_swatch' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Swatch::class,
+            'eav_resource/entity_attribute_option_swatch' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Swatch::class,
             'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
@@ -18916,6 +18915,7 @@
             'usa/shipping_carrier_fedex_source_packaging' => \Mage_Usa_Model_Shipping_Carrier_Fedex_Source_Packaging::class,
             'usa/shipping_carrier_fedex_source_unitofmeasure' => \Mage_Usa_Model_Shipping_Carrier_Fedex_Source_Unitofmeasure::class,
             'usa/shipping_carrier_ups' => \Mage_Usa_Model_Shipping_Carrier_Ups::class,
+            'usa/shipping_carrier_upsAuth' => \Mage_Usa_Model_Shipping_Carrier_UpsAuth::class,
             'usa/shipping_carrier_ups_backend_freemethod' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_Freemethod::class,
             'usa/shipping_carrier_ups_backend_originShipment' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_OriginShipment::class,
             'usa/shipping_carrier_ups_backend_type' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_Type::class,
@@ -18998,11 +18998,6 @@
     );
     override( \Mage_SalesRule_Model_Validator::_getSingleton(0),
         map( [
-            'core_resource/session' => \Cm_RedisSession_Model_Session::class,
-            'cm_redissession/session' => \Cm_RedisSession_Model_Session::class,
-            'cm_redissession/session_config' => \Cm_RedisSession_Model_Session_Config::class,
-            'cm_redissession/session_handler' => \Cm_RedisSession_Model_Session_Handler::class,
-            'cm_redissession/session_logger' => \Cm_RedisSession_Model_Session_Logger::class,
             'adminnotification/feed' => \Mage_AdminNotification_Model_Feed::class,
             'adminnotification/inbox' => \Mage_AdminNotification_Model_Inbox::class,
             'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class,
@@ -20227,6 +20222,7 @@
             'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
             'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
             'core/resource_session' => \Mage_Core_Model_Resource_Session::class,
+            'core_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'payment_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class,
             'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
@@ -20627,6 +20623,7 @@
             'eav/entity_attribute_frontend_default' => \Mage_Eav_Model_Entity_Attribute_Frontend_Default::class,
             'eav/entity_attribute_group' => \Mage_Eav_Model_Entity_Attribute_Group::class,
             'eav/entity_attribute_option' => \Mage_Eav_Model_Entity_Attribute_Option::class,
+            'eav/entity_attribute_option_swatch' => \Mage_Eav_Model_Entity_Attribute_Option_Swatch::class,
             'eav/entity_attribute_set' => \Mage_Eav_Model_Entity_Attribute_Set::class,
             'eav/entity_attribute_source_abstract' => \Mage_Eav_Model_Entity_Attribute_Source_Abstract::class,
             'eav/entity_attribute_source_boolean' => \Mage_Eav_Model_Entity_Attribute_Source_Boolean::class,
@@ -20682,6 +20679,8 @@
             'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
             'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
             'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
+            'eav/resource_entity_attribute_option_swatch' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Swatch::class,
+            'eav_resource/entity_attribute_option_swatch' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Swatch::class,
             'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
@@ -22082,6 +22081,7 @@
             'usa/shipping_carrier_fedex_source_packaging' => \Mage_Usa_Model_Shipping_Carrier_Fedex_Source_Packaging::class,
             'usa/shipping_carrier_fedex_source_unitofmeasure' => \Mage_Usa_Model_Shipping_Carrier_Fedex_Source_Unitofmeasure::class,
             'usa/shipping_carrier_ups' => \Mage_Usa_Model_Shipping_Carrier_Ups::class,
+            'usa/shipping_carrier_upsAuth' => \Mage_Usa_Model_Shipping_Carrier_UpsAuth::class,
             'usa/shipping_carrier_ups_backend_freemethod' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_Freemethod::class,
             'usa/shipping_carrier_ups_backend_originShipment' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_OriginShipment::class,
             'usa/shipping_carrier_ups_backend_type' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_Type::class,
@@ -22164,11 +22164,6 @@
     );
     override( \Mage_Shipping_Model_Carrier_Tablerate::_getModel(0),
         map( [
-            'core_resource/session' => \Cm_RedisSession_Model_Session::class,
-            'cm_redissession/session' => \Cm_RedisSession_Model_Session::class,
-            'cm_redissession/session_config' => \Cm_RedisSession_Model_Session_Config::class,
-            'cm_redissession/session_handler' => \Cm_RedisSession_Model_Session_Handler::class,
-            'cm_redissession/session_logger' => \Cm_RedisSession_Model_Session_Logger::class,
             'adminnotification/feed' => \Mage_AdminNotification_Model_Feed::class,
             'adminnotification/inbox' => \Mage_AdminNotification_Model_Inbox::class,
             'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class,
@@ -23393,6 +23388,7 @@
             'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
             'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
             'core/resource_session' => \Mage_Core_Model_Resource_Session::class,
+            'core_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'payment_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class,
             'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
@@ -23793,6 +23789,7 @@
             'eav/entity_attribute_frontend_default' => \Mage_Eav_Model_Entity_Attribute_Frontend_Default::class,
             'eav/entity_attribute_group' => \Mage_Eav_Model_Entity_Attribute_Group::class,
             'eav/entity_attribute_option' => \Mage_Eav_Model_Entity_Attribute_Option::class,
+            'eav/entity_attribute_option_swatch' => \Mage_Eav_Model_Entity_Attribute_Option_Swatch::class,
             'eav/entity_attribute_set' => \Mage_Eav_Model_Entity_Attribute_Set::class,
             'eav/entity_attribute_source_abstract' => \Mage_Eav_Model_Entity_Attribute_Source_Abstract::class,
             'eav/entity_attribute_source_boolean' => \Mage_Eav_Model_Entity_Attribute_Source_Boolean::class,
@@ -23848,6 +23845,8 @@
             'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
             'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
             'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
+            'eav/resource_entity_attribute_option_swatch' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Swatch::class,
+            'eav_resource/entity_attribute_option_swatch' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Swatch::class,
             'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
@@ -25248,6 +25247,7 @@
             'usa/shipping_carrier_fedex_source_packaging' => \Mage_Usa_Model_Shipping_Carrier_Fedex_Source_Packaging::class,
             'usa/shipping_carrier_fedex_source_unitofmeasure' => \Mage_Usa_Model_Shipping_Carrier_Fedex_Source_Unitofmeasure::class,
             'usa/shipping_carrier_ups' => \Mage_Usa_Model_Shipping_Carrier_Ups::class,
+            'usa/shipping_carrier_upsAuth' => \Mage_Usa_Model_Shipping_Carrier_UpsAuth::class,
             'usa/shipping_carrier_ups_backend_freemethod' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_Freemethod::class,
             'usa/shipping_carrier_ups_backend_originShipment' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_OriginShipment::class,
             'usa/shipping_carrier_ups_backend_type' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_Type::class,
@@ -25330,11 +25330,6 @@
     );
     override( \Mage_Wishlist_Helper_Data::_getSingletonModel(0),
         map( [
-            'core_resource/session' => \Cm_RedisSession_Model_Session::class,
-            'cm_redissession/session' => \Cm_RedisSession_Model_Session::class,
-            'cm_redissession/session_config' => \Cm_RedisSession_Model_Session_Config::class,
-            'cm_redissession/session_handler' => \Cm_RedisSession_Model_Session_Handler::class,
-            'cm_redissession/session_logger' => \Cm_RedisSession_Model_Session_Logger::class,
             'adminnotification/feed' => \Mage_AdminNotification_Model_Feed::class,
             'adminnotification/inbox' => \Mage_AdminNotification_Model_Inbox::class,
             'adminnotification/mysql4_inbox' => \Mage_AdminNotification_Model_Mysql4_Inbox::class,
@@ -26559,6 +26554,7 @@
             'core_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
             'payment_resource/resource' => \Mage_Core_Model_Resource_Resource::class,
             'core/resource_session' => \Mage_Core_Model_Resource_Session::class,
+            'core_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'payment_resource/session' => \Mage_Core_Model_Resource_Session::class,
             'core/resource_setup' => \Mage_Core_Model_Resource_Setup::class,
             'core_resource/setup' => \Mage_Core_Model_Resource_Setup::class,
@@ -26959,6 +26955,7 @@
             'eav/entity_attribute_frontend_default' => \Mage_Eav_Model_Entity_Attribute_Frontend_Default::class,
             'eav/entity_attribute_group' => \Mage_Eav_Model_Entity_Attribute_Group::class,
             'eav/entity_attribute_option' => \Mage_Eav_Model_Entity_Attribute_Option::class,
+            'eav/entity_attribute_option_swatch' => \Mage_Eav_Model_Entity_Attribute_Option_Swatch::class,
             'eav/entity_attribute_set' => \Mage_Eav_Model_Entity_Attribute_Set::class,
             'eav/entity_attribute_source_abstract' => \Mage_Eav_Model_Entity_Attribute_Source_Abstract::class,
             'eav/entity_attribute_source_boolean' => \Mage_Eav_Model_Entity_Attribute_Source_Boolean::class,
@@ -27014,6 +27011,8 @@
             'eav_resource/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
             'eav/resource_entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
             'eav_resource/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
+            'eav/resource_entity_attribute_option_swatch' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Swatch::class,
+            'eav_resource/entity_attribute_option_swatch' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Swatch::class,
             'eav/resource_entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav_resource/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav/resource_entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
@@ -28414,6 +28413,7 @@
             'usa/shipping_carrier_fedex_source_packaging' => \Mage_Usa_Model_Shipping_Carrier_Fedex_Source_Packaging::class,
             'usa/shipping_carrier_fedex_source_unitofmeasure' => \Mage_Usa_Model_Shipping_Carrier_Fedex_Source_Unitofmeasure::class,
             'usa/shipping_carrier_ups' => \Mage_Usa_Model_Shipping_Carrier_Ups::class,
+            'usa/shipping_carrier_upsAuth' => \Mage_Usa_Model_Shipping_Carrier_UpsAuth::class,
             'usa/shipping_carrier_ups_backend_freemethod' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_Freemethod::class,
             'usa/shipping_carrier_ups_backend_originShipment' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_OriginShipment::class,
             'usa/shipping_carrier_ups_backend_type' => \Mage_Usa_Model_Shipping_Carrier_Ups_Backend_Type::class,
diff --git a/.phpstorm.meta.php/magento_resource_models.meta.php b/.phpstorm.meta.php/magento_resource_models.meta.php
index 9249d6b6c3c..ed85d132c6f 100644
--- a/.phpstorm.meta.php/magento_resource_models.meta.php
+++ b/.phpstorm.meta.php/magento_resource_models.meta.php
@@ -2,7 +2,6 @@
 namespace PHPSTORM_META {
     override( \Mage::getResourceModel(0),
         map( [
-            'core/session' => \Cm_RedisSession_Model_Session::class,
             'adminnotification/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
             'adminnotification/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
             'admin/acl' => \Mage_Admin_Model_Resource_Acl::class,
@@ -251,6 +250,7 @@
             'core/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
             'core/layout' => \Mage_Core_Model_Resource_Layout::class,
             'core/resource' => \Mage_Core_Model_Resource_Resource::class,
+            'core/session' => \Mage_Core_Model_Resource_Session::class,
             'core/setup' => \Mage_Core_Model_Resource_Setup::class,
             'core/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core/store' => \Mage_Core_Model_Resource_Store::class,
@@ -330,6 +330,7 @@
             'eav/entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class,
             'eav/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
             'eav/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
+            'eav/entity_attribute_option_swatch' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Swatch::class,
             'eav/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav/entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
             'eav/entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class,
@@ -642,7 +643,6 @@
     );
     override( \Mage::getResourceSingleton(0),
         map( [
-            'core/session' => \Cm_RedisSession_Model_Session::class,
             'adminnotification/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
             'adminnotification/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
             'admin/acl' => \Mage_Admin_Model_Resource_Acl::class,
@@ -891,6 +891,7 @@
             'core/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
             'core/layout' => \Mage_Core_Model_Resource_Layout::class,
             'core/resource' => \Mage_Core_Model_Resource_Resource::class,
+            'core/session' => \Mage_Core_Model_Resource_Session::class,
             'core/setup' => \Mage_Core_Model_Resource_Setup::class,
             'core/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core/store' => \Mage_Core_Model_Resource_Store::class,
@@ -970,6 +971,7 @@
             'eav/entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class,
             'eav/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
             'eav/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
+            'eav/entity_attribute_option_swatch' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Swatch::class,
             'eav/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav/entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
             'eav/entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class,
diff --git a/.phpstorm.meta.php/magento_resource_models_methods.meta.php b/.phpstorm.meta.php/magento_resource_models_methods.meta.php
index a9d361fd726..8ea4a12a632 100644
--- a/.phpstorm.meta.php/magento_resource_models_methods.meta.php
+++ b/.phpstorm.meta.php/magento_resource_models_methods.meta.php
@@ -2,7 +2,6 @@
 namespace PHPSTORM_META {
     override( \Mage_Core_Model_Factory::getResourceModel(0),
         map( [
-            'core/session' => \Cm_RedisSession_Model_Session::class,
             'adminnotification/inbox' => \Mage_AdminNotification_Model_Resource_Inbox::class,
             'adminnotification/inbox_collection' => \Mage_AdminNotification_Model_Resource_Inbox_Collection::class,
             'admin/acl' => \Mage_Admin_Model_Resource_Acl::class,
@@ -251,6 +250,7 @@
             'core/language_collection' => \Mage_Core_Model_Resource_Language_Collection::class,
             'core/layout' => \Mage_Core_Model_Resource_Layout::class,
             'core/resource' => \Mage_Core_Model_Resource_Resource::class,
+            'core/session' => \Mage_Core_Model_Resource_Session::class,
             'core/setup' => \Mage_Core_Model_Resource_Setup::class,
             'core/setup_query_modifier' => \Mage_Core_Model_Resource_Setup_Query_Modifier::class,
             'core/store' => \Mage_Core_Model_Resource_Store::class,
@@ -330,6 +330,7 @@
             'eav/entity_attribute_group_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection::class,
             'eav/entity_attribute_option' => \Mage_Eav_Model_Resource_Entity_Attribute_Option::class,
             'eav/entity_attribute_option_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection::class,
+            'eav/entity_attribute_option_swatch' => \Mage_Eav_Model_Resource_Entity_Attribute_Option_Swatch::class,
             'eav/entity_attribute_set' => \Mage_Eav_Model_Resource_Entity_Attribute_Set::class,
             'eav/entity_attribute_set_collection' => \Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection::class,
             'eav/entity_store' => \Mage_Eav_Model_Resource_Entity_Store::class,
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php
index 9e827bf526f..4a3fa59f634 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php
@@ -19,6 +19,9 @@
  */
 class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Ajax_Serializer extends Mage_Core_Block_Template
 {
+    /**
+     * @return $this
+     */
     public function _construct()
     {
         parent::_construct();
diff --git a/app/code/core/Mage/Bundle/Model/Product/Type.php b/app/code/core/Mage/Bundle/Model/Product/Type.php
index 0aa62b607c2..89133c76c6f 100644
--- a/app/code/core/Mage/Bundle/Model/Product/Type.php
+++ b/app/code/core/Mage/Bundle/Model/Product/Type.php
@@ -263,7 +263,6 @@ public function beforeSave($product = null)
      */
     public function save($product = null)
     {
-        parent::save($product);
         $product = $this->getProduct($product);
         /** @var Mage_Bundle_Model_Resource_Bundle $resource */
         $resource = Mage::getResourceModel('bundle/bundle');
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php
index c86a5b15327..49dc05be87c 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php
@@ -420,7 +420,6 @@ public function beforeSave($product = null)
      */
     public function save($product = null)
     {
-        parent::save($product);
         /**
          * Save Attributes Information
          */
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php b/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php
index 161b2e475db..a191d56a2a7 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php
@@ -278,7 +278,6 @@ public function isSalable($product = null)
      */
     public function save($product = null)
     {
-        parent::save($product);
         $this->getProduct($product)->getLinkInstance()->saveGroupedLinks($this->getProduct($product));
         return $this;
     }
diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php
index 40d45b56b43..c9d17d2bf95 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php
@@ -34,7 +34,7 @@ class Mage_CatalogIndex_Model_Indexer_Eav extends Mage_CatalogIndex_Model_Indexe
     protected function _construct()
     {
         $this->_init('catalogindex/indexer_eav');
-        return parent::_construct();
+        parent::_construct();
     }
 
     /**
diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php
index 46a3af488fe..ec510f88593 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php
@@ -54,7 +54,7 @@ protected function _construct()
         $this->_currencyModel = Mage::getModel('directory/currency');
         $this->_customerGroups = Mage::getModel('customer/group')->getCollection();
 
-        return parent::_construct();
+        parent::_construct();
     }
 
     /**
diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php
index debaca581ac..1aaa79c16d5 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php
@@ -60,7 +60,7 @@ protected function _construct()
         $this->_currencyModel = Mage::getModel('directory/currency');
         $this->_customerGroups = Mage::getModel('customer/group')->getCollection();
 
-        return parent::_construct();
+        parent::_construct();
     }
 
     /**
diff --git a/app/code/core/Mage/Core/Block/Template.php b/app/code/core/Mage/Core/Block/Template.php
index 2598f3304a1..41bb5803d2e 100644
--- a/app/code/core/Mage/Core/Block/Template.php
+++ b/app/code/core/Mage/Core/Block/Template.php
@@ -67,6 +67,7 @@ class Mage_Core_Block_Template extends Mage_Core_Block_Abstract
     /**
      * Internal constructor, that is called from real constructor
      *
+     * @return void
      */
     protected function _construct()
     {
diff --git a/app/code/core/Mage/Core/Controller/Varien/Action.php b/app/code/core/Mage/Core/Controller/Varien/Action.php
index e9122080bd5..d15c76b0522 100644
--- a/app/code/core/Mage/Core/Controller/Varien/Action.php
+++ b/app/code/core/Mage/Core/Controller/Varien/Action.php
@@ -130,6 +130,9 @@ public function __construct(Zend_Controller_Request_Abstract $request, Zend_Cont
         $this->_construct();
     }
 
+    /**
+     * @return void
+     */
     protected function _construct()
     {
     }
diff --git a/app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php
index c773305b81f..75df6120ac7 100644
--- a/app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php
@@ -125,6 +125,7 @@ public function __construct($resource = null)
     /**
      * Initialization here
      *
+     * @return void
      */
     protected function _construct()
     {
diff --git a/app/code/core/Mage/Downloadable/Model/Product/Type.php b/app/code/core/Mage/Downloadable/Model/Product/Type.php
index 32efc635dba..ce31bb51e66 100644
--- a/app/code/core/Mage/Downloadable/Model/Product/Type.php
+++ b/app/code/core/Mage/Downloadable/Model/Product/Type.php
@@ -138,8 +138,6 @@ public function hasSamples($product = null)
      */
     public function save($product = null)
     {
-        parent::save($product);
-
         $product = $this->getProduct($product);
         if ($data = $product->getDownloadableData()) {
             if (isset($data['sample'])) {
diff --git a/app/code/core/Mage/Paypal/Block/Express/Form.php b/app/code/core/Mage/Paypal/Block/Express/Form.php
index edc1ec127b2..98178b675cd 100644
--- a/app/code/core/Mage/Paypal/Block/Express/Form.php
+++ b/app/code/core/Mage/Paypal/Block/Express/Form.php
@@ -32,9 +32,8 @@ class Mage_Paypal_Block_Express_Form extends Mage_Paypal_Block_Standard_Form
      */
     protected function _construct()
     {
-        $result = parent::_construct();
+        parent::_construct();
         $this->setRedirectMessage(Mage::helper('paypal')->__('You will be redirected to the PayPal website.'));
-        return $result;
     }
 
     /**
diff --git a/app/code/core/Mage/Paypal/Block/Standard/Form.php b/app/code/core/Mage/Paypal/Block/Standard/Form.php
index 44157ccbbf6..d21631190c4 100644
--- a/app/code/core/Mage/Paypal/Block/Standard/Form.php
+++ b/app/code/core/Mage/Paypal/Block/Standard/Form.php
@@ -36,6 +36,8 @@ class Mage_Paypal_Block_Standard_Form extends Mage_Payment_Block_Form
 
     /**
      * Set template and redirect message
+     *
+     * @return void
      */
     protected function _construct()
     {
@@ -54,7 +56,7 @@ protected function _construct()
             ->setMethodTitle('') // Output PayPal mark, omit title
             ->setMethodLabelAfterHtml($mark->toHtml())
         ;
-        return parent::_construct();
+        parent::_construct();
     }
 
     /**
diff --git a/app/code/core/Mage/Paypal/Model/Payment/Transaction.php b/app/code/core/Mage/Paypal/Model/Payment/Transaction.php
index 21dbc204e32..e4b48b46060 100644
--- a/app/code/core/Mage/Paypal/Model/Payment/Transaction.php
+++ b/app/code/core/Mage/Paypal/Model/Payment/Transaction.php
@@ -60,7 +60,7 @@ class Mage_Paypal_Model_Payment_Transaction extends Mage_Core_Model_Abstract
     protected function _construct()
     {
         $this->_init('paypal/payment_transaction');
-        return parent::_construct();
+        parent::_construct();
     }
 
     /**
diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php
index 5cacc1fded8..43cca27f90e 100644
--- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php
+++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php
@@ -79,7 +79,7 @@ public function setProductEntity(Mage_Catalog_Model_Product $product)
     protected function _construct()
     {
         $this->_profile = Mage::getSingleton('sales/recurring_profile');
-        return parent::_construct();
+        parent::_construct();
     }
 
     /**
diff --git a/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php b/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php
index 7457514faea..6927359620a 100644
--- a/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php
+++ b/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php
@@ -130,7 +130,7 @@ class Mage_Sales_Model_Order_Payment_Transaction extends Mage_Core_Model_Abstrac
     protected function _construct()
     {
         $this->_init('sales/order_payment_transaction');
-        return parent::_construct();
+        parent::_construct();
     }
 
     /**
diff --git a/composer.json b/composer.json
index e4bca138cae..33272d87991 100644
--- a/composer.json
+++ b/composer.json
@@ -43,7 +43,7 @@
         "openmage/dev-meta-package": "^1.0",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpmd/phpmd": "^2.13",
-        "phpstan/phpstan": "^1.9.13",
+        "phpstan/phpstan": "^1.11",
         "phpunit/phpunit": "^9.5",
         "squizlabs/php_codesniffer": "^3.7",
         "symplify/vendor-patches": "^11.1"
diff --git a/composer.lock b/composer.lock
index 4534cf595de..99ce1602d9f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "5c217ee2c019c16647fa9060716afaf6",
+    "content-hash": "3d728362b534d576376af960b6dc160f",
     "packages": [
         {
             "name": "colinmollenhour/cache-backend-redis",
@@ -3407,16 +3407,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.67",
+            "version": "1.11.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "16ddbe776f10da6a95ebd25de7c1dbed397dc493"
+                "reference": "0d5d4294a70deb7547db655c47685d680e39cfec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/16ddbe776f10da6a95ebd25de7c1dbed397dc493",
-                "reference": "16ddbe776f10da6a95ebd25de7c1dbed397dc493",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0d5d4294a70deb7547db655c47685d680e39cfec",
+                "reference": "0d5d4294a70deb7547db655c47685d680e39cfec",
                 "shasum": ""
             },
             "require": {
@@ -3461,7 +3461,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-04-16T07:22:02+00:00"
+            "time": "2024-05-24T13:23:04+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
diff --git a/lib/Varien/Object.php b/lib/Varien/Object.php
index 6c52cc545ca..bfd0f11bcff 100644
--- a/lib/Varien/Object.php
+++ b/lib/Varien/Object.php
@@ -131,6 +131,8 @@ protected function _prepareSyncFieldsMap()
 
     /**
      * Internal constructor not depended on params. Can be used for object initialization
+     *
+     * @return void
      */
     protected function _construct()
     {