diff --git a/classes/Category.php b/classes/Category.php
index 178c05e97..d73bb2f4c 100644
--- a/classes/Category.php
+++ b/classes/Category.php
@@ -549,7 +549,7 @@ class CategoryCore extends ObjectModel
 	{
 		$sql_groups_where = '';
 		$sql_groups_join = '';
-		if (Configuration::get('PS_GROUP_FEATURE_ACTIVE'))
+		if (Group::isFeatureActive())
 		{
 			$sql_groups_join = 'LEFT JOIN `'._DB_PREFIX_.'category_group` cg ON (cg.`id_category` = c.`id_category`)';
 			$groups = FrontController::getCurrentCustomerGroups();
diff --git a/classes/GroupReduction.php b/classes/GroupReduction.php
index f42dcf705..cd657432f 100644
--- a/classes/GroupReduction.php
+++ b/classes/GroupReduction.php
@@ -132,7 +132,7 @@ class GroupReductionCore extends ObjectModel
 
 	public static function getValueForProduct($id_product, $id_group)
 	{
-		if (!Configuration::get('PS_GROUP_FEATURE_ACTIVE'))
+		if (!Group::isFeatureActive())
 			return 0;
 	
 		if (!isset(self::$reduction_cache[$id_product.'-'.$id_group]))
diff --git a/classes/Manufacturer.php b/classes/Manufacturer.php
index 2916cd22a..ae15e4ecb 100644
--- a/classes/Manufacturer.php
+++ b/classes/Manufacturer.php
@@ -159,7 +159,7 @@ class ManufacturerCore extends ObjectModel
 	{
 		if (!$id_lang)
 			$id_lang = (int)Configuration::get('PS_LANG_DEFAULT');
-		if (!Configuration::get('PS_GROUP_FEATURE_ACTIVE'))
+		if (!Group::isFeatureActive())
 			$all_group = true;
 
 		$sql = 'SELECT m.*, ml.`description`, ml.`short_description`
diff --git a/classes/Product.php b/classes/Product.php
index 08590f2cb..cd8e85b53 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -2009,7 +2009,7 @@ class ProductCore extends ObjectModel
 			die(Tools::displayError());
 
 		$sql_groups = '';
-		if (Configuration::get('PS_GROUP_FEATURE_ACTIVE'))
+		if (Group::isFeatureActive())
 		{
 			$groups = FrontController::getCurrentCustomerGroups();
 			$sql_groups = 'AND p.`id_product` IN (
@@ -2061,7 +2061,7 @@ class ProductCore extends ObjectModel
 		if ($front)
 			$sql->where('product_shop.`visibility` IN ("both", "catalog")');
 		$sql->where('product_shop.`date_add` > "'.date('Y-m-d', strtotime('-'.(Configuration::get('PS_NB_DAYS_NEW_PRODUCT') ? (int)Configuration::get('PS_NB_DAYS_NEW_PRODUCT') : 20).' DAY')).'"');
-		if (Configuration::get('PS_GROUP_FEATURE_ACTIVE'))
+		if (Group::isFeatureActive())
 			$sql->where('p.`id_product` IN (
 				SELECT cp.`id_product`
 				FROM `'._DB_PREFIX_.'category_group` cg
@@ -2241,7 +2241,7 @@ class ProductCore extends ObjectModel
 			$front = false;
 
 		$sql_groups = '';
-		if (Configuration::get('PS_GROUP_FEATURE_ACTIVE'))
+		if (Group::isFeatureActive())
 		{
 			$groups = FrontController::getCurrentCustomerGroups();
 			$sql_groups = 'AND p.`id_product` IN (
@@ -4342,7 +4342,7 @@ class ProductCore extends ObjectModel
 
 	public function checkAccess($id_customer)
 	{
-		if (!Configuration::get('PS_GROUP_FEATURE_ACTIVE'))
+		if (!Group::isFeatureActive())
 			return true;
 
 		if (!$id_customer)
diff --git a/classes/ProductSale.php b/classes/ProductSale.php
index 4df788477..44627f159 100644
--- a/classes/ProductSale.php
+++ b/classes/ProductSale.php
@@ -73,7 +73,7 @@ class ProductSaleCore
 		if (is_null($order_way) || $order_by == 'sales') $order_way = 'DESC';
 
 		$sql_groups = '';
-		if (Configuration::get('PS_GROUP_FEATURE_ACTIVE'))
+		if (Group::isFeatureActive())
 		{
 			$groups = FrontController::getCurrentCustomerGroups();
 			$sql_groups = 'WHERE cg.`id_group` '.(count($groups) ? 'IN ('.implode(',', $groups).')' : '= 1');
@@ -152,7 +152,7 @@ class ProductSaleCore
 		if ($nb_products < 1) $nb_products = 10;
 
 		$sql_groups = '';
-		if (Configuration::get('PS_GROUP_FEATURE_ACTIVE'))
+		if (Group::isFeatureActive())
 		{
 			$groups = FrontController::getCurrentCustomerGroups();
 			$sql_groups = 'AND cg.`id_group` '.(count($groups) ? 'IN ('.implode(',', $groups).')' : '= 1');
diff --git a/classes/Search.php b/classes/Search.php
index e7c8c5d2e..4edd58879 100644
--- a/classes/Search.php
+++ b/classes/Search.php
@@ -230,7 +230,7 @@ class SearchCore
 			) position';
 
 		$sql_groups = '';
-		if (Configuration::get('PS_GROUP_FEATURE_ACTIVE'))
+		if (Group::isFeatureActive())
 		{
 			$groups = FrontController::getCurrentCustomerGroups();
 			$sql_groups = 'AND cg.`id_group` '.(count($groups) ? 'IN ('.implode(',', $groups).')' : '= 1');
@@ -239,7 +239,7 @@ class SearchCore
 		$results = $db->executeS('
 		SELECT cp.`id_product`
 		FROM `'._DB_PREFIX_.'category_product` cp
-		'.(Configuration::get('PS_GROUP_FEATURE_ACTIVE') ? 'INNER JOIN `'._DB_PREFIX_.'category_group` cg ON cp.`id_category` = cg.`id_category`' : '').'
+		'.(Group::isFeatureActive() ? 'INNER JOIN `'._DB_PREFIX_.'category_group` cg ON cp.`id_category` = cg.`id_category`' : '').'
 		INNER JOIN `'._DB_PREFIX_.'category` c ON cp.`id_category` = c.`id_category`
 		INNER JOIN `'._DB_PREFIX_.'product` p ON cp.`id_product` = p.`id_product`
 		'.Shop::addSqlAssociation('product', 'p', false).'
@@ -641,7 +641,7 @@ class SearchCore
 		$id_shop = $id ? $id : Configuration::get('PS_SHOP_DEFAULT');
 		
 		$sql_groups = '';
-		if (Configuration::get('PS_GROUP_FEATURE_ACTIVE'))
+		if (Group::isFeatureActive())
 		{
 			$groups = FrontController::getCurrentCustomerGroups();
 			$sql_groups = 'AND cg.`id_group` '.(count($groups) ? 'IN ('.implode(',', $groups).')' : '= 1');
@@ -657,7 +657,7 @@ class SearchCore
 			LEFT JOIN `'._DB_PREFIX_.'tag` t ON (pt.`id_tag` = t.`id_tag` AND t.`id_lang` = '.(int)$id_lang.')
 			LEFT JOIN `'._DB_PREFIX_.'category_product` cp ON (cp.`id_product` = p.`id_product`)
 			LEFT JOIN `'._DB_PREFIX_.'category_shop` cs ON (cp.`id_category` = cs.`id_category` AND cs.`id_shop` = '.(int)$id_shop.')
-			'.(Configuration::get('PS_GROUP_FEATURE_ACTIVE') ? 'LEFT JOIN `'._DB_PREFIX_.'category_group` cg ON (cg.`id_category` = cp.`id_category`)' : '').'
+			'.(Group::isFeatureActive() ? 'LEFT JOIN `'._DB_PREFIX_.'category_group` cg ON (cg.`id_category` = cp.`id_category`)' : '').'
 			WHERE product_shop.`active` = 1
 			AND cs.`id_shop` = '.(int)Context::getContext()->shop->id.'
 			'.$sql_groups.'
@@ -686,7 +686,7 @@ class SearchCore
 				LEFT JOIN `'._DB_PREFIX_.'product_tag` pt ON (p.`id_product` = pt.`id_product`)
 				LEFT JOIN `'._DB_PREFIX_.'tag` t ON (pt.`id_tag` = t.`id_tag` AND t.`id_lang` = '.(int)$id_lang.')
 				LEFT JOIN `'._DB_PREFIX_.'category_product` cp ON (cp.`id_product` = p.`id_product`)
-				'.(Configuration::get('PS_GROUP_FEATURE_ACTIVE') ? 'LEFT JOIN `'._DB_PREFIX_.'category_group` cg ON (cg.`id_category` = cp.`id_category`)' : '').'
+				'.(Group::isFeatureActive() ? 'LEFT JOIN `'._DB_PREFIX_.'category_group` cg ON (cg.`id_category` = cp.`id_category`)' : '').'
 				LEFT JOIN `'._DB_PREFIX_.'category_shop` cs ON (cg.`id_category` = cs.`id_category` AND cs.`id_shop` = '.(int)$id_shop.')
 				'.Product::sqlStock('p', 0).'
 				WHERE product_shop.`active` = 1
diff --git a/classes/Supplier.php b/classes/Supplier.php
index ac224b056..7b5e23bed 100644
--- a/classes/Supplier.php
+++ b/classes/Supplier.php
@@ -107,7 +107,7 @@ class SupplierCore extends ObjectModel
 	{
 		if (!$id_lang)
 			$id_lang = Configuration::get('PS_LANG_DEFAULT');
-		if (!Configuration::get('PS_GROUP_FEATURE_ACTIVE'))
+		if (!Group::isFeatureActive())
 			$all_groups = true;
 
 		$query = new DbQuery();
@@ -210,7 +210,7 @@ class SupplierCore extends ObjectModel
 			die (Tools::displayError());
 
 		$sql_groups = '';
-		if (Configuration::get('PS_GROUP_FEATURE_ACTIVE'))
+		if (Group::isFeatureActive())
 		{
 			$groups = FrontController::getCurrentCustomerGroups();
 			$sql_groups = 'WHERE cg.`id_group` '.(count($groups) ? 'IN ('.implode(',', $groups).')' : '= 1');
@@ -230,7 +230,7 @@ class SupplierCore extends ObjectModel
 			AND p.`id_product` IN (
 				SELECT cp.`id_product`
 				FROM `'._DB_PREFIX_.'category_product` cp
-				'.(Configuration::get('PS_GROUP_FEATURE_ACTIVE') ? 'LEFT JOIN `'._DB_PREFIX_.'category_group` cg ON (cp.`id_category` = cg.`id_category`)' : '').'
+				'.(Group::isFeatureActive() ? 'LEFT JOIN `'._DB_PREFIX_.'category_group` cg ON (cp.`id_category` = cg.`id_category`)' : '').'
 				'.($active_category ? ' INNER JOIN `'._DB_PREFIX_.'category` ca ON cp.`id_category` = ca.`id_category` AND ca.`active` = 1' : '').'
 				'.$sql_groups.'
 			)');
@@ -286,7 +286,7 @@ class SupplierCore extends ObjectModel
 					AND p.`id_product` IN (
 						SELECT cp.`id_product`
 						FROM `'._DB_PREFIX_.'category_product` cp
-						'.(Configuration::get('PS_GROUP_FEATURE_ACTIVE') ? 'LEFT JOIN `'._DB_PREFIX_.'category_group` cg ON (cp.`id_category` = cg.`id_category`)' : '').'
+						'.(Group::isFeatureActive() ? 'LEFT JOIN `'._DB_PREFIX_.'category_group` cg ON (cp.`id_category` = cg.`id_category`)' : '').'
 						'.($active_category ? ' INNER JOIN `'._DB_PREFIX_.'category` ca ON cp.`id_category` = ca.`id_category` AND ca.`active` = 1' : '').'
 						'.$sql_groups.'
 					)
diff --git a/classes/Tag.php b/classes/Tag.php
index 01d6aa0d9..ae5146959 100644
--- a/classes/Tag.php
+++ b/classes/Tag.php
@@ -131,7 +131,7 @@ class TagCore extends ObjectModel
 	public static function getMainTags($id_lang, $nb = 10)
 	{
 		$sql_groups = '';
-		if (Configuration::get('PS_GROUP_FEATURE_ACTIVE'))
+		if (Group::isFeatureActive())
 		{
 			$groups = FrontController::getCurrentCustomerGroups();
 			$sql_groups = '
diff --git a/classes/module/Module.php b/classes/module/Module.php
index 14a31d77d..350cdfe5d 100644
--- a/classes/module/Module.php
+++ b/classes/module/Module.php
@@ -1677,7 +1677,8 @@ abstract class ModuleCore
 			$cache_array[] = (int)Tools::usingSecureMode();
 		if (Shop::isFeatureActive())
 			$cache_array[] = (int)$this->context->shop->id;
-		$cache_array[] = (int)Group::getCurrent()->id;
+		if (Group::isFeatureActive())
+			$cache_array[] = (int)Group::getCurrent()->id;
 		if (Language::isMultiLanguageActivated())
 			$cache_array[] = (int)$this->context->language->id;
 		if (Currency::isMultiCurrencyActivated())
diff --git a/install-dev/data/xml/configuration.xml b/install-dev/data/xml/configuration.xml
index 4b337da4d..ed7bedff9 100644
--- a/install-dev/data/xml/configuration.xml
+++ b/install-dev/data/xml/configuration.xml
@@ -15,7 +15,7 @@
       <value>1</value>
     </configuration>
     <configuration id="PS_GROUP_FEATURE_ACTIVE" name="PS_GROUP_FEATURE_ACTIVE">
-      <value>1</value>
+      <value>0</value>
     </configuration>
     <configuration id="PS_CURRENCY_DEFAULT" name="PS_CURRENCY_DEFAULT">
       <value>1</value>