incrize

diff --git a/design/backend/templates/addons/product_variations/hooks/products/picker_template_selection_item_product_code.pre.tpl b/design/backend/templates/addons/product_variations/hooks/products/picker_template_selection_item_product_code.pre.tpl
new file mode 100644
index 0000000000..15f6a39979
--- /dev/null
+++ b/design/backend/templates/addons/product_variations/hooks/products/picker_template_selection_item_product_code.pre.tpl
@@ -0,0 +1,8 @@
+{literal}
+    ${data.variation_features
+        ? `<div class="product-variations__variation-features product-variations__variation-features--inline product-variations__variation-features--mini">
+            ${data.variation_features.map(function (item) { return item.variant }).join(" • ")}&nbsp;—

incrize

diff --git a/app/addons/master_products/func.php b/app/addons/master_products/func.php
index 5b73713530..b5eb5ca118 100644
--- a/app/addons/master_products/func.php
+++ b/app/addons/master_products/func.php
@@ -935,4 +935,23 @@ function fn_product_variations_master_products_create_vendor_product($master_pro
     } else {
         $variation_service->createGroup([$vendor_product_id], null, GroupFeatureCollection::createFromFeatureList($master_product_group['feature_collection']));
     }
-}
\ No newline at end of file

incrize

diff --git a/_docs/developer_changes/patch.md b/_docs/developer_changes/patch.md
index 8bb9158355..ecea49b9cb 100644
--- a/_docs/developer_changes/patch.md
+++ b/_docs/developer_changes/patch.md
@@ -15,3 +15,8 @@
 -fn_set_hook('clone_product_options_post', $from_product_id, $to_product_id, $from_global_option_id);
 +fn_set_hook('clone_product_options_post', $from_product_id, $to_product_id, $from_global_option_id, $change_options, $change_variants);
 ```
+
+```

incrize

diff --git a/app/Tygh/Tools/Url.php b/app/Tygh/Tools/Url.php
index 9f48960fdb..90087be78b 100644
--- a/app/Tygh/Tools/Url.php
+++ b/app/Tygh/Tools/Url.php
@@ -161,6 +161,17 @@ class Url
         return $this->query_params;
     }
 
+    /**
+     * @param string     $key

incrize

<?php

define('AREA', 'A');
define('ACCOUNT_TYPE', 'admin');


require(dirname(__FILE__) . '/init.php');

\Tygh\Registry::set('runtime.company_id', 0);

incrize

<?php

define('AREA', 'A');
define('ACCOUNT_TYPE', 'admin');


require(dirname(__FILE__) . '/init.php');

\Tygh\Registry::set('runtime.company_id', 0);

incrize

diff --git a/app/addons/tags/func.php b/app/addons/tags/func.php
index 81bd8f6021..1b167bd10e 100644
--- a/app/addons/tags/func.php
+++ b/app/addons/tags/func.php
@@ -272,17 +272,19 @@ function fn_delete_tags_by_params($params)
 
     // Check if tags have links and delete them if not
     $_tag_ids = db_get_fields("SELECT tag_id FROM ?:tag_links WHERE tag_id IN (?n)", $tag_ids);
-    $diff = array_diff($tag_ids, $_tag_ids);
-    if (!empty($diff)) {

incrize

diff --git a/app/addons/product_variations_2/Tygh/Addons/ProductVariations/Product/ProductIdMap.php b/app/addons/product_variations_2/Tygh/Addons/ProductVariations/Product/ProductIdMap.php
index 359d793e14..2563feed83 100644
--- a/app/addons/product_variations_2/Tygh/Addons/ProductVariations/Product/ProductIdMap.php
+++ b/app/addons/product_variations_2/Tygh/Addons/ProductVariations/Product/ProductIdMap.php
@@ -15,7 +15,7 @@
 namespace Tygh\Addons\ProductVariations\Product;
 
 
-use Tygh\Addons\ProductVariations\Product\Group\Repository;
+use Tygh\Addons\ProductVariations\Product\Group\Repository as GroupRepository;

incrize

diff --git a/app/addons/my_changes/func.php b/app/addons/my_changes/func.php
new file mode 100644
index 0000000000..328a147bad
--- /dev/null
+++ b/app/addons/my_changes/func.php
@@ -0,0 +1,24 @@
+<?php
+/***************************************************************************
+ *                                                                          *
+ *   (c) 2004 Vladimir V. Kalynyak, Alexey V. Vinokurov, Ilya M. Shalnev    *

incrize

diff --git a/admin.php b/admin.php
index 153a7f67d2..0a673fee91 100644
--- a/admin.php
+++ b/admin.php
@@ -24,7 +24,23 @@ define('ACCOUNT_TYPE', 'admin');
 try {
     require(dirname(__FILE__) . '/init.php');
 
+    /** @var \Tygh\Lock\Factory $lock_factory */
+    $lock_factory = Tygh::$app['lock.factory'];