From 567baf7410c6fccaf1e1561c29423814801c7b87 Mon Sep 17 00:00:00 2001
From: Andrii Meysar <andrii.meysar@transoftgroup.com>
Date: Wed, 11 Dec 2019 11:24:00 +0200
Subject: [PATCH 1/4] MC-29473: Strange changes in the URL structure for
 subcategories

---
 setup/src/Magento/Setup/Fixtures/CategoriesFixture.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/setup/src/Magento/Setup/Fixtures/CategoriesFixture.php b/setup/src/Magento/Setup/Fixtures/CategoriesFixture.php
index e8a0a469e2ee5..782f688f8a09e 100644
--- a/setup/src/Magento/Setup/Fixtures/CategoriesFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/CategoriesFixture.php
@@ -9,6 +9,7 @@
 use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\CategoryFactory;
 use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
+use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManager;
 
 /**
@@ -82,7 +83,7 @@ public function __construct(
     protected $priority = 20;
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function execute()
     {
@@ -97,7 +98,7 @@ public function execute()
             $category = $this->categoryFactory->create();
             $category->load($parentCategoryId);
             // Need for generation url rewrites per all category store view
-            $category->setStoreId(\Magento\Store\Model\Store::DEFAULT_STORE_ID);
+            $category->setStoreId(Store::DEFAULT_STORE_ID);
             $categoryIndex = 1;
             $this->generateCategories(
                 $category,
@@ -130,6 +131,7 @@ private function generateCategories(
                 $category->setId(null)
                     ->setUrlKey(null)
                     ->setUrlPath(null)
+                    ->setStoreId(Store::DEFAULT_STORE_ID)
                     ->setName($this->getCategoryName($parentCategory, $nestingLevel, $i))
                     ->setParentId($parentCategory->getId())
                     ->setLevel($parentCategory->getLevel() + 1)
@@ -237,7 +239,7 @@ private function getCategoryPrefix()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getActionTitle()
     {
@@ -245,7 +247,7 @@ public function getActionTitle()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function introduceParamLabels()
     {

From 049762c1f65a64ae4239438f9a6bf7b0798e1a3a Mon Sep 17 00:00:00 2001
From: Andrii Meysar <andrii.meysar@transoftgroup.com>
Date: Wed, 11 Dec 2019 13:29:00 +0200
Subject: [PATCH 2/4] MC-29473: Strange changes in the URL structure for
 subcategories

---
 .../Setup/Test/Unit/Fixtures/CategoriesFixtureTest.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/setup/src/Magento/Setup/Test/Unit/Fixtures/CategoriesFixtureTest.php b/setup/src/Magento/Setup/Test/Unit/Fixtures/CategoriesFixtureTest.php
index 9e2a7b46514bd..348afab198ab8 100644
--- a/setup/src/Magento/Setup/Test/Unit/Fixtures/CategoriesFixtureTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Fixtures/CategoriesFixtureTest.php
@@ -12,6 +12,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Setup\Fixtures\CategoriesFixture;
 use Magento\Setup\Fixtures\FixtureModel;
+use Magento\Store\Model\Store;
 
 class CategoriesFixtureTest extends \PHPUnit\Framework\TestCase
 {
@@ -40,7 +41,10 @@ class CategoriesFixtureTest extends \PHPUnit\Framework\TestCase
      */
     private $categoryFactoryMock;
 
-    public function setUp()
+    /**
+     * @inhertidoc
+     */
+    protected function setUp()
     {
         $this->fixtureModelMock = $this->createMock(FixtureModel::class);
         $this->collectionFactoryMock = $this->createPartialMock(CollectionFactory::class, ['create']);
@@ -146,6 +150,10 @@ public function testExecute()
         $categoryMock->expects($this->once())
             ->method('setIsActive')
             ->willReturnSelf();
+        $categoryMock->expects($this->exactly(2))
+            ->method('setStoreId')
+            ->with(Store::DEFAULT_STORE_ID)
+            ->willReturnSelf();
 
         $this->categoryFactoryMock->expects($this->once())->method('create')->willReturn($categoryMock);
 

From 2065f022ab8597cc9bec23fe0e05dfd0256a1e44 Mon Sep 17 00:00:00 2001
From: DianaRusin <rusind95@gmail.com>
Date: Mon, 17 Feb 2020 14:46:39 +0200
Subject: [PATCH 3/4] MC-31315: [2.3.5] Mark Signifyd as Deprecated in Magento
 core

---
 app/code/Magento/Signifyd/Api/CaseCreationServiceInterface.php | 2 ++
 app/code/Magento/Signifyd/Api/CaseManagementInterface.php      | 2 ++
 app/code/Magento/Signifyd/Api/CaseRepositoryInterface.php      | 2 ++
 app/code/Magento/Signifyd/Api/Data/CaseInterface.php           | 2 ++
 .../Magento/Signifyd/Api/Data/CaseSearchResultsInterface.php   | 2 ++
 .../Signifyd/Api/GuaranteeCancelingServiceInterface.php        | 2 ++
 .../Magento/Signifyd/Api/GuaranteeCreationServiceInterface.php | 2 ++
 app/code/Magento/Signifyd/Block/Adminhtml/CaseInfo.php         | 2 ++
 .../Block/Adminhtml/System/Config/Field/WebhookUrl.php         | 3 +++
 .../Signifyd/Block/Adminhtml/System/Config/Fieldset/Info.php   | 3 +++
 app/code/Magento/Signifyd/Block/Fingerprint.php                | 2 ++
 app/code/Magento/Signifyd/Controller/Webhooks/Handler.php      | 2 ++
 app/code/Magento/Signifyd/Model/CaseEntity.php                 | 3 +++
 app/code/Magento/Signifyd/Model/CaseManagement.php             | 3 +++
 app/code/Magento/Signifyd/Model/CaseRepository.php             | 2 ++
 app/code/Magento/Signifyd/Model/CaseSearchResults.php          | 3 +++
 .../Magento/Signifyd/Model/CaseServices/CreationService.php    | 3 +++
 .../Signifyd/Model/CaseServices/StubUpdatingService.php        | 3 +++
 .../Magento/Signifyd/Model/CaseServices/UpdatingService.php    | 3 +++
 .../Signifyd/Model/CaseServices/UpdatingServiceFactory.php     | 3 +++
 .../Signifyd/Model/CaseServices/UpdatingServiceInterface.php   | 3 +++
 app/code/Magento/Signifyd/Model/CommentsHistoryUpdater.php     | 3 +++
 app/code/Magento/Signifyd/Model/Config.php                     | 3 +++
 app/code/Magento/Signifyd/Model/CustomerOrders.php             | 2 ++
 .../Signifyd/Model/Guarantee/CancelGuaranteeAbility.php        | 3 +++
 app/code/Magento/Signifyd/Model/Guarantee/CancelingService.php | 3 +++
 .../Signifyd/Model/Guarantee/CreateGuaranteeAbility.php        | 3 +++
 app/code/Magento/Signifyd/Model/Guarantee/CreationService.php  | 3 +++
 .../Magento/Signifyd/Model/MessageGenerators/CaseRescore.php   | 3 +++
 .../Signifyd/Model/MessageGenerators/GeneratorException.php    | 2 ++
 .../Signifyd/Model/MessageGenerators/GeneratorFactory.php      | 3 +++
 .../Signifyd/Model/MessageGenerators/GeneratorInterface.php    | 3 +++
 .../Signifyd/Model/MessageGenerators/PatternGenerator.php      | 3 +++
 app/code/Magento/Signifyd/Model/OrderStateService.php          | 3 +++
 .../Signifyd/Model/PaymentMethodMapper/PaymentMethodMapper.php | 3 +++
 .../Model/PaymentMethodMapper/XmlToArrayConfigConverter.php    | 3 +++
 app/code/Magento/Signifyd/Model/PaymentVerificationFactory.php | 3 +++
 app/code/Magento/Signifyd/Model/PredefinedVerificationCode.php | 3 +++
 .../Signifyd/Model/QuoteSession/Adminhtml/BackendSession.php   | 3 +++
 .../Magento/Signifyd/Model/QuoteSession/FrontendSession.php    | 3 +++
 .../Signifyd/Model/QuoteSession/QuoteSessionInterface.php      | 3 +++
 app/code/Magento/Signifyd/Model/ResourceModel/CaseEntity.php   | 3 +++
 .../Signifyd/Model/ResourceModel/CaseEntity/Collection.php     | 3 +++
 .../Model/SalesOrderGrid/NotSyncedOrderIdListProvider.php      | 3 +++
 .../Magento/Signifyd/Model/SalesOrderGrid/OrderGridUpdater.php | 3 +++
 .../Signifyd/Model/SignifydGateway/ApiCallException.php        | 3 +++
 app/code/Magento/Signifyd/Model/SignifydGateway/ApiClient.php  | 3 +++
 .../Model/SignifydGateway/Client/HttpClientFactory.php         | 3 +++
 .../Signifyd/Model/SignifydGateway/Client/RequestBuilder.php   | 3 +++
 .../Signifyd/Model/SignifydGateway/Client/RequestSender.php    | 3 +++
 .../Signifyd/Model/SignifydGateway/Client/ResponseHandler.php  | 3 +++
 .../Signifyd/Model/SignifydGateway/Debugger/BlackHole.php      | 3 +++
 .../Model/SignifydGateway/Debugger/DebuggerFactory.php         | 3 +++
 .../Model/SignifydGateway/Debugger/DebuggerInterface.php       | 3 +++
 .../Magento/Signifyd/Model/SignifydGateway/Debugger/Log.php    | 3 +++
 app/code/Magento/Signifyd/Model/SignifydGateway/Gateway.php    | 3 +++
 .../Signifyd/Model/SignifydGateway/GatewayException.php        | 3 +++
 .../Signifyd/Model/SignifydGateway/Request/AddressBuilder.php  | 3 +++
 .../Signifyd/Model/SignifydGateway/Request/CardBuilder.php     | 3 +++
 .../Model/SignifydGateway/Request/ClientVersionBuilder.php     | 3 +++
 .../Model/SignifydGateway/Request/CreateCaseBuilder.php        | 2 ++
 .../SignifydGateway/Request/CreateCaseBuilderInterface.php     | 3 +++
 .../Signifyd/Model/SignifydGateway/Request/PurchaseBuilder.php | 3 +++
 .../Model/SignifydGateway/Request/RecipientBuilder.php         | 3 +++
 .../Signifyd/Model/SignifydGateway/Request/SellerBuilder.php   | 3 +++
 .../Model/SignifydGateway/Request/UserAccountBuilder.php       | 3 +++
 .../Signifyd/Model/SignifydGateway/Response/WebhookMessage.php | 3 +++
 .../Model/SignifydGateway/Response/WebhookMessageReader.php    | 3 +++
 .../Signifyd/Model/SignifydGateway/Response/WebhookRequest.php | 3 +++
 .../Model/SignifydGateway/Response/WebhookRequestValidator.php | 2 ++
 app/code/Magento/Signifyd/Model/SignifydOrderSessionId.php     | 3 +++
 app/code/Magento/Signifyd/Observer/PlaceOrder.php              | 3 +++
 app/code/Magento/Signifyd/Plugin/OrderPlugin.php               | 2 ++
 app/code/Magento/Signifyd/Plugin/PaymentPlugin.php             | 2 ++
 .../Signifyd/Ui/Component/Listing/Column/Guarantee/Options.php | 3 +++
 app/code/Magento/Signifyd/etc/adminhtml/system.xml             | 1 +
 76 files changed, 209 insertions(+)

diff --git a/app/code/Magento/Signifyd/Api/CaseCreationServiceInterface.php b/app/code/Magento/Signifyd/Api/CaseCreationServiceInterface.php
index f7611660b93a1..2ff093d68ce10 100644
--- a/app/code/Magento/Signifyd/Api/CaseCreationServiceInterface.php
+++ b/app/code/Magento/Signifyd/Api/CaseCreationServiceInterface.php
@@ -13,6 +13,8 @@
  *
  * @api
  * @since 100.2.0
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 interface CaseCreationServiceInterface
 {
diff --git a/app/code/Magento/Signifyd/Api/CaseManagementInterface.php b/app/code/Magento/Signifyd/Api/CaseManagementInterface.php
index 69075a308cb96..267e204d166df 100644
--- a/app/code/Magento/Signifyd/Api/CaseManagementInterface.php
+++ b/app/code/Magento/Signifyd/Api/CaseManagementInterface.php
@@ -11,6 +11,8 @@
  *
  * @api
  * @since 100.2.0
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 interface CaseManagementInterface
 {
diff --git a/app/code/Magento/Signifyd/Api/CaseRepositoryInterface.php b/app/code/Magento/Signifyd/Api/CaseRepositoryInterface.php
index 4f148a082b300..cc233b4998fcb 100644
--- a/app/code/Magento/Signifyd/Api/CaseRepositoryInterface.php
+++ b/app/code/Magento/Signifyd/Api/CaseRepositoryInterface.php
@@ -10,6 +10,8 @@
  *
  * @api
  * @since 100.2.0
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 interface CaseRepositoryInterface
 {
diff --git a/app/code/Magento/Signifyd/Api/Data/CaseInterface.php b/app/code/Magento/Signifyd/Api/Data/CaseInterface.php
index eff46b972fc02..0801ed1ea1dcd 100644
--- a/app/code/Magento/Signifyd/Api/Data/CaseInterface.php
+++ b/app/code/Magento/Signifyd/Api/Data/CaseInterface.php
@@ -13,6 +13,8 @@
  * @api
  * @see https://www.signifyd.com/docs/api/#/reference/cases/retrieve-a-case/get-a-case
  * @since 100.2.0
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 interface CaseInterface
 {
diff --git a/app/code/Magento/Signifyd/Api/Data/CaseSearchResultsInterface.php b/app/code/Magento/Signifyd/Api/Data/CaseSearchResultsInterface.php
index 78d37841cff69..994a2fcfb3f90 100644
--- a/app/code/Magento/Signifyd/Api/Data/CaseSearchResultsInterface.php
+++ b/app/code/Magento/Signifyd/Api/Data/CaseSearchResultsInterface.php
@@ -12,6 +12,8 @@
  *
  * @api
  * @since 100.2.0
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 interface CaseSearchResultsInterface extends SearchResultsInterface
 {
diff --git a/app/code/Magento/Signifyd/Api/GuaranteeCancelingServiceInterface.php b/app/code/Magento/Signifyd/Api/GuaranteeCancelingServiceInterface.php
index 41f4753d036a7..aefc98a116a3b 100644
--- a/app/code/Magento/Signifyd/Api/GuaranteeCancelingServiceInterface.php
+++ b/app/code/Magento/Signifyd/Api/GuaranteeCancelingServiceInterface.php
@@ -13,6 +13,8 @@
  *
  * @api
  * @since 100.2.0
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 interface GuaranteeCancelingServiceInterface
 {
diff --git a/app/code/Magento/Signifyd/Api/GuaranteeCreationServiceInterface.php b/app/code/Magento/Signifyd/Api/GuaranteeCreationServiceInterface.php
index b4502ea861acd..dc6093d4eb2f0 100644
--- a/app/code/Magento/Signifyd/Api/GuaranteeCreationServiceInterface.php
+++ b/app/code/Magento/Signifyd/Api/GuaranteeCreationServiceInterface.php
@@ -13,6 +13,8 @@
  *
  * @api
  * @since 100.2.0
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 interface GuaranteeCreationServiceInterface
 {
diff --git a/app/code/Magento/Signifyd/Block/Adminhtml/CaseInfo.php b/app/code/Magento/Signifyd/Block/Adminhtml/CaseInfo.php
index 87d09e392e091..f333af56f071c 100644
--- a/app/code/Magento/Signifyd/Block/Adminhtml/CaseInfo.php
+++ b/app/code/Magento/Signifyd/Block/Adminhtml/CaseInfo.php
@@ -15,6 +15,8 @@
  *
  * @api
  * @since 100.2.0
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class CaseInfo extends Template
 {
diff --git a/app/code/Magento/Signifyd/Block/Adminhtml/System/Config/Field/WebhookUrl.php b/app/code/Magento/Signifyd/Block/Adminhtml/System/Config/Field/WebhookUrl.php
index 7964d6b1af397..cbfce6c8fb925 100644
--- a/app/code/Magento/Signifyd/Block/Adminhtml/System/Config/Field/WebhookUrl.php
+++ b/app/code/Magento/Signifyd/Block/Adminhtml/System/Config/Field/WebhookUrl.php
@@ -12,6 +12,9 @@
 
 /**
  * Input field transformed to text node with link to store Signifyd webhooks controller.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class WebhookUrl extends Field
 {
diff --git a/app/code/Magento/Signifyd/Block/Adminhtml/System/Config/Fieldset/Info.php b/app/code/Magento/Signifyd/Block/Adminhtml/System/Config/Fieldset/Info.php
index c18c3dc596e21..01ec287a02b98 100644
--- a/app/code/Magento/Signifyd/Block/Adminhtml/System/Config/Fieldset/Info.php
+++ b/app/code/Magento/Signifyd/Block/Adminhtml/System/Config/Fieldset/Info.php
@@ -9,6 +9,9 @@
 
 /**
  * Fieldset renderer with url attached to comment.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class Info extends Fieldset
 {
diff --git a/app/code/Magento/Signifyd/Block/Fingerprint.php b/app/code/Magento/Signifyd/Block/Fingerprint.php
index f43bffce1fc1a..78ea8f68eb72c 100644
--- a/app/code/Magento/Signifyd/Block/Fingerprint.php
+++ b/app/code/Magento/Signifyd/Block/Fingerprint.php
@@ -20,6 +20,8 @@
  * @api
  * @see https://www.signifyd.com/docs/api/#/reference/device-fingerprint/create-a-case
  * @since 100.2.0
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class Fingerprint extends Template
 {
diff --git a/app/code/Magento/Signifyd/Controller/Webhooks/Handler.php b/app/code/Magento/Signifyd/Controller/Webhooks/Handler.php
index 2dee31f4048b9..fdc89f4dc5a9d 100644
--- a/app/code/Magento/Signifyd/Controller/Webhooks/Handler.php
+++ b/app/code/Magento/Signifyd/Controller/Webhooks/Handler.php
@@ -22,6 +22,8 @@
  * Responsible for handling webhook posts from Signifyd service.
  *
  * @see https://www.signifyd.com/docs/api/#/reference/webhooks/
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class Handler extends Action implements \Magento\Framework\App\CsrfAwareActionInterface
 {
diff --git a/app/code/Magento/Signifyd/Model/CaseEntity.php b/app/code/Magento/Signifyd/Model/CaseEntity.php
index c11c72db79f16..9240bd71bc880 100644
--- a/app/code/Magento/Signifyd/Model/CaseEntity.php
+++ b/app/code/Magento/Signifyd/Model/CaseEntity.php
@@ -15,6 +15,9 @@
 
 /**
  * Implementation of Signifyd Case interface.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class CaseEntity extends AbstractModel implements CaseInterface
 {
diff --git a/app/code/Magento/Signifyd/Model/CaseManagement.php b/app/code/Magento/Signifyd/Model/CaseManagement.php
index 1913f1e7a17b3..74d475026487a 100644
--- a/app/code/Magento/Signifyd/Model/CaseManagement.php
+++ b/app/code/Magento/Signifyd/Model/CaseManagement.php
@@ -17,6 +17,9 @@
 /**
  *
  * Default case management implementation
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class CaseManagement implements CaseManagementInterface
 {
diff --git a/app/code/Magento/Signifyd/Model/CaseRepository.php b/app/code/Magento/Signifyd/Model/CaseRepository.php
index ea3ea3e67aafd..f0c0a2d85f57b 100644
--- a/app/code/Magento/Signifyd/Model/CaseRepository.php
+++ b/app/code/Magento/Signifyd/Model/CaseRepository.php
@@ -20,6 +20,8 @@
  * Repository for Case interface
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class CaseRepository implements CaseRepositoryInterface
 {
diff --git a/app/code/Magento/Signifyd/Model/CaseSearchResults.php b/app/code/Magento/Signifyd/Model/CaseSearchResults.php
index ff1ab8839f6cd..f6a8e13b432f9 100644
--- a/app/code/Magento/Signifyd/Model/CaseSearchResults.php
+++ b/app/code/Magento/Signifyd/Model/CaseSearchResults.php
@@ -12,6 +12,9 @@
 
 /**
  * Service Data Object with Case entities search results.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class CaseSearchResults extends SearchResults implements CaseSearchResultsInterface
 {
diff --git a/app/code/Magento/Signifyd/Model/CaseServices/CreationService.php b/app/code/Magento/Signifyd/Model/CaseServices/CreationService.php
index 8413838bd7d5f..ddfd08480f594 100644
--- a/app/code/Magento/Signifyd/Model/CaseServices/CreationService.php
+++ b/app/code/Magento/Signifyd/Model/CaseServices/CreationService.php
@@ -18,6 +18,9 @@
  * Case Creation Service
  *
  * Creates new Case entity and register it at Signifyd
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class CreationService implements CaseCreationServiceInterface
 {
diff --git a/app/code/Magento/Signifyd/Model/CaseServices/StubUpdatingService.php b/app/code/Magento/Signifyd/Model/CaseServices/StubUpdatingService.php
index 295d7f13fb0ac..e62294c6b1b16 100644
--- a/app/code/Magento/Signifyd/Model/CaseServices/StubUpdatingService.php
+++ b/app/code/Magento/Signifyd/Model/CaseServices/StubUpdatingService.php
@@ -10,6 +10,9 @@
 /**
  * Stub implementation for case updating service interface and might be used
  * for test Signifyd webhooks
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class StubUpdatingService implements UpdatingServiceInterface
 {
diff --git a/app/code/Magento/Signifyd/Model/CaseServices/UpdatingService.php b/app/code/Magento/Signifyd/Model/CaseServices/UpdatingService.php
index 168ab67f8cf50..1c9c4e3ee5f5b 100644
--- a/app/code/Magento/Signifyd/Model/CaseServices/UpdatingService.php
+++ b/app/code/Magento/Signifyd/Model/CaseServices/UpdatingService.php
@@ -16,6 +16,9 @@
 
 /**
  * Performs Signifyd case entity updating operations.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class UpdatingService implements UpdatingServiceInterface
 {
diff --git a/app/code/Magento/Signifyd/Model/CaseServices/UpdatingServiceFactory.php b/app/code/Magento/Signifyd/Model/CaseServices/UpdatingServiceFactory.php
index 5415044b5edc4..5fde6d365a214 100644
--- a/app/code/Magento/Signifyd/Model/CaseServices/UpdatingServiceFactory.php
+++ b/app/code/Magento/Signifyd/Model/CaseServices/UpdatingServiceFactory.php
@@ -13,6 +13,9 @@
  * Creates instance of case updating service configured with specific message generator.
  * The message generator initialization depends on specified type (like, case creation, re-scoring, review and
  * guarantee completion).
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class UpdatingServiceFactory
 {
diff --git a/app/code/Magento/Signifyd/Model/CaseServices/UpdatingServiceInterface.php b/app/code/Magento/Signifyd/Model/CaseServices/UpdatingServiceInterface.php
index daa7b40bfd674..9c97f5610c146 100644
--- a/app/code/Magento/Signifyd/Model/CaseServices/UpdatingServiceInterface.php
+++ b/app/code/Magento/Signifyd/Model/CaseServices/UpdatingServiceInterface.php
@@ -9,6 +9,9 @@
 
 /**
  * Common abstraction to perform updating operations with Signifyd case entity.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 interface UpdatingServiceInterface
 {
diff --git a/app/code/Magento/Signifyd/Model/CommentsHistoryUpdater.php b/app/code/Magento/Signifyd/Model/CommentsHistoryUpdater.php
index f473d157efa4a..4215993e3f4b8 100644
--- a/app/code/Magento/Signifyd/Model/CommentsHistoryUpdater.php
+++ b/app/code/Magento/Signifyd/Model/CommentsHistoryUpdater.php
@@ -12,6 +12,9 @@
 
 /**
  * Updates case order comments history.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class CommentsHistoryUpdater
 {
diff --git a/app/code/Magento/Signifyd/Model/Config.php b/app/code/Magento/Signifyd/Model/Config.php
index 15d3608bd38c4..a119ed7fa4b09 100644
--- a/app/code/Magento/Signifyd/Model/Config.php
+++ b/app/code/Magento/Signifyd/Model/Config.php
@@ -12,6 +12,9 @@
  * Signifyd integration configuration.
  *
  * Class is a proxy service for retrieving configuration settings.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class Config
 {
diff --git a/app/code/Magento/Signifyd/Model/CustomerOrders.php b/app/code/Magento/Signifyd/Model/CustomerOrders.php
index c326cf06424c0..65bb2141bdda5 100644
--- a/app/code/Magento/Signifyd/Model/CustomerOrders.php
+++ b/app/code/Magento/Signifyd/Model/CustomerOrders.php
@@ -18,6 +18,8 @@
  * Provides information about customer orders.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class CustomerOrders
 {
diff --git a/app/code/Magento/Signifyd/Model/Guarantee/CancelGuaranteeAbility.php b/app/code/Magento/Signifyd/Model/Guarantee/CancelGuaranteeAbility.php
index 65bede6f0cea5..34bfa51330c85 100644
--- a/app/code/Magento/Signifyd/Model/Guarantee/CancelGuaranteeAbility.php
+++ b/app/code/Magento/Signifyd/Model/Guarantee/CancelGuaranteeAbility.php
@@ -13,6 +13,9 @@
 
 /**
  * Checks if is possible to cancel Guarantee for order.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class CancelGuaranteeAbility
 {
diff --git a/app/code/Magento/Signifyd/Model/Guarantee/CancelingService.php b/app/code/Magento/Signifyd/Model/Guarantee/CancelingService.php
index b30efac8c2190..fc5a6cda25340 100644
--- a/app/code/Magento/Signifyd/Model/Guarantee/CancelingService.php
+++ b/app/code/Magento/Signifyd/Model/Guarantee/CancelingService.php
@@ -14,6 +14,9 @@
 
 /**
  * Sends request to Signifyd to cancel guarantee and updates case entity.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class CancelingService implements GuaranteeCancelingServiceInterface
 {
diff --git a/app/code/Magento/Signifyd/Model/Guarantee/CreateGuaranteeAbility.php b/app/code/Magento/Signifyd/Model/Guarantee/CreateGuaranteeAbility.php
index 15addba3ec4fd..ea60c5ef8b131 100644
--- a/app/code/Magento/Signifyd/Model/Guarantee/CreateGuaranteeAbility.php
+++ b/app/code/Magento/Signifyd/Model/Guarantee/CreateGuaranteeAbility.php
@@ -15,6 +15,9 @@
 
 /**
  * Checks if is possible to create Guarantee for order.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class CreateGuaranteeAbility
 {
diff --git a/app/code/Magento/Signifyd/Model/Guarantee/CreationService.php b/app/code/Magento/Signifyd/Model/Guarantee/CreationService.php
index 4080aee453f18..8f5f7ef5daf27 100644
--- a/app/code/Magento/Signifyd/Model/Guarantee/CreationService.php
+++ b/app/code/Magento/Signifyd/Model/Guarantee/CreationService.php
@@ -16,6 +16,9 @@
 
 /**
  * Register guarantee at Signifyd and updates case entity
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class CreationService implements GuaranteeCreationServiceInterface
 {
diff --git a/app/code/Magento/Signifyd/Model/MessageGenerators/CaseRescore.php b/app/code/Magento/Signifyd/Model/MessageGenerators/CaseRescore.php
index d0e89854e3909..407425a986ed4 100644
--- a/app/code/Magento/Signifyd/Model/MessageGenerators/CaseRescore.php
+++ b/app/code/Magento/Signifyd/Model/MessageGenerators/CaseRescore.php
@@ -9,6 +9,9 @@
 
 /**
  * Generates message based on previous and current Case scores.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class CaseRescore implements GeneratorInterface
 {
diff --git a/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorException.php b/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorException.php
index 103cb9fc1e2d3..7128382265a9e 100644
--- a/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorException.php
+++ b/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorException.php
@@ -12,6 +12,8 @@
  *
  * @api
  * @since 100.2.0
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class GeneratorException extends LocalizedException
 {
diff --git a/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorFactory.php b/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorFactory.php
index 66e02a3803950..a1e26163c1953 100644
--- a/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorFactory.php
+++ b/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorFactory.php
@@ -10,6 +10,9 @@
 
 /**
  * Creates instance of message generator based on received type of message.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class GeneratorFactory
 {
diff --git a/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorInterface.php b/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorInterface.php
index 385cbe35f05ac..1e153e9996f25 100644
--- a/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorInterface.php
+++ b/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorInterface.php
@@ -8,6 +8,9 @@
 /**
  * Represents common abstraction for Signifyd Case/Guarantee messages.
  * Each interface implementation might use Case/Guarantee data to generate specific message.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 interface GeneratorInterface
 {
diff --git a/app/code/Magento/Signifyd/Model/MessageGenerators/PatternGenerator.php b/app/code/Magento/Signifyd/Model/MessageGenerators/PatternGenerator.php
index 8501934bebbc5..28574d6dddc8c 100644
--- a/app/code/Magento/Signifyd/Model/MessageGenerators/PatternGenerator.php
+++ b/app/code/Magento/Signifyd/Model/MessageGenerators/PatternGenerator.php
@@ -14,6 +14,9 @@
  * placeholders, for example:
  * Message is 'Case Update: New score for the order is %1. Previous score was %2.', then the required params order
  * should be ['new_score', 'prev_score'].
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class PatternGenerator implements GeneratorInterface
 {
diff --git a/app/code/Magento/Signifyd/Model/OrderStateService.php b/app/code/Magento/Signifyd/Model/OrderStateService.php
index 2b3f0e155981e..f108de575feb4 100644
--- a/app/code/Magento/Signifyd/Model/OrderStateService.php
+++ b/app/code/Magento/Signifyd/Model/OrderStateService.php
@@ -12,6 +12,9 @@
 
 /**
  * Updates order state.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class OrderStateService
 {
diff --git a/app/code/Magento/Signifyd/Model/PaymentMethodMapper/PaymentMethodMapper.php b/app/code/Magento/Signifyd/Model/PaymentMethodMapper/PaymentMethodMapper.php
index cdf9041510b45..ae5dd76ec5019 100644
--- a/app/code/Magento/Signifyd/Model/PaymentMethodMapper/PaymentMethodMapper.php
+++ b/app/code/Magento/Signifyd/Model/PaymentMethodMapper/PaymentMethodMapper.php
@@ -9,6 +9,9 @@
 
 /**
  * Load and cache configuration data.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class PaymentMethodMapper
 {
diff --git a/app/code/Magento/Signifyd/Model/PaymentMethodMapper/XmlToArrayConfigConverter.php b/app/code/Magento/Signifyd/Model/PaymentMethodMapper/XmlToArrayConfigConverter.php
index 5c3f23bb92729..c579dc0359885 100644
--- a/app/code/Magento/Signifyd/Model/PaymentMethodMapper/XmlToArrayConfigConverter.php
+++ b/app/code/Magento/Signifyd/Model/PaymentMethodMapper/XmlToArrayConfigConverter.php
@@ -9,6 +9,9 @@
 
 /**
  * Converts XML config file to payment methods mapping.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class XmlToArrayConfigConverter implements \Magento\Framework\Config\ConverterInterface
 {
diff --git a/app/code/Magento/Signifyd/Model/PaymentVerificationFactory.php b/app/code/Magento/Signifyd/Model/PaymentVerificationFactory.php
index 5be5ccbc5e55a..6791ee55f900f 100644
--- a/app/code/Magento/Signifyd/Model/PaymentVerificationFactory.php
+++ b/app/code/Magento/Signifyd/Model/PaymentVerificationFactory.php
@@ -13,6 +13,9 @@
 /**
  * Creates verification service for provided payment method, or PaymentVerificationInterface::class
  * if payment method does not support AVS, CVV verifications.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class PaymentVerificationFactory
 {
diff --git a/app/code/Magento/Signifyd/Model/PredefinedVerificationCode.php b/app/code/Magento/Signifyd/Model/PredefinedVerificationCode.php
index 618d74b2a52e9..3db3f330df993 100644
--- a/app/code/Magento/Signifyd/Model/PredefinedVerificationCode.php
+++ b/app/code/Magento/Signifyd/Model/PredefinedVerificationCode.php
@@ -11,6 +11,9 @@
 /**
  * Default implementation of payment verification interface.
  * The default code value can be configured via DI.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class PredefinedVerificationCode implements PaymentVerificationInterface
 {
diff --git a/app/code/Magento/Signifyd/Model/QuoteSession/Adminhtml/BackendSession.php b/app/code/Magento/Signifyd/Model/QuoteSession/Adminhtml/BackendSession.php
index 9be02719545c7..5020f0ac91310 100644
--- a/app/code/Magento/Signifyd/Model/QuoteSession/Adminhtml/BackendSession.php
+++ b/app/code/Magento/Signifyd/Model/QuoteSession/Adminhtml/BackendSession.php
@@ -10,6 +10,9 @@
 
 /**
  * Implementation of QuoteSessionInterface for Magento backend checkout.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class BackendSession implements QuoteSessionInterface
 {
diff --git a/app/code/Magento/Signifyd/Model/QuoteSession/FrontendSession.php b/app/code/Magento/Signifyd/Model/QuoteSession/FrontendSession.php
index 44c226ae4a47e..3986941b5e5b2 100644
--- a/app/code/Magento/Signifyd/Model/QuoteSession/FrontendSession.php
+++ b/app/code/Magento/Signifyd/Model/QuoteSession/FrontendSession.php
@@ -9,6 +9,9 @@
 
 /**
  * Implementation of QuoteSessionInterface for Magento frontend checkout.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class FrontendSession implements QuoteSessionInterface
 {
diff --git a/app/code/Magento/Signifyd/Model/QuoteSession/QuoteSessionInterface.php b/app/code/Magento/Signifyd/Model/QuoteSession/QuoteSessionInterface.php
index 14958ac65a6ee..529b51dae9ca7 100644
--- a/app/code/Magento/Signifyd/Model/QuoteSession/QuoteSessionInterface.php
+++ b/app/code/Magento/Signifyd/Model/QuoteSession/QuoteSessionInterface.php
@@ -7,6 +7,9 @@
 
 /**
  * Interface QuoteSessionInterface
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 interface QuoteSessionInterface
 {
diff --git a/app/code/Magento/Signifyd/Model/ResourceModel/CaseEntity.php b/app/code/Magento/Signifyd/Model/ResourceModel/CaseEntity.php
index 9c6ffde4504b9..eeacc43a5c64d 100644
--- a/app/code/Magento/Signifyd/Model/ResourceModel/CaseEntity.php
+++ b/app/code/Magento/Signifyd/Model/ResourceModel/CaseEntity.php
@@ -9,6 +9,9 @@
 
 /**
  * Implementation of case resource model
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class CaseEntity extends AbstractDb
 {
diff --git a/app/code/Magento/Signifyd/Model/ResourceModel/CaseEntity/Collection.php b/app/code/Magento/Signifyd/Model/ResourceModel/CaseEntity/Collection.php
index 92e233dd42dbc..b7f2eb8950ce0 100644
--- a/app/code/Magento/Signifyd/Model/ResourceModel/CaseEntity/Collection.php
+++ b/app/code/Magento/Signifyd/Model/ResourceModel/CaseEntity/Collection.php
@@ -11,6 +11,9 @@
 
 /**
  * Collection of case entities
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class Collection extends AbstractCollection
 {
diff --git a/app/code/Magento/Signifyd/Model/SalesOrderGrid/NotSyncedOrderIdListProvider.php b/app/code/Magento/Signifyd/Model/SalesOrderGrid/NotSyncedOrderIdListProvider.php
index 360225ae37b7b..86272b490d233 100644
--- a/app/code/Magento/Signifyd/Model/SalesOrderGrid/NotSyncedOrderIdListProvider.php
+++ b/app/code/Magento/Signifyd/Model/SalesOrderGrid/NotSyncedOrderIdListProvider.php
@@ -11,6 +11,9 @@
 
 /**
  * Provides order ids list which Signifyd Case guaranty status were changed
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class NotSyncedOrderIdListProvider implements NotSyncedDataProviderInterface
 {
diff --git a/app/code/Magento/Signifyd/Model/SalesOrderGrid/OrderGridUpdater.php b/app/code/Magento/Signifyd/Model/SalesOrderGrid/OrderGridUpdater.php
index fff42b300be58..d8a66423139dc 100644
--- a/app/code/Magento/Signifyd/Model/SalesOrderGrid/OrderGridUpdater.php
+++ b/app/code/Magento/Signifyd/Model/SalesOrderGrid/OrderGridUpdater.php
@@ -12,6 +12,9 @@
  * Perfoms sales order grid updating operations.
  *
  * Serves order grid updates in both synchronous and asynchronous modes.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class OrderGridUpdater
 {
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/ApiCallException.php b/app/code/Magento/Signifyd/Model/SignifydGateway/ApiCallException.php
index 73338c8ea4d62..0e74115f4f07f 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/ApiCallException.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/ApiCallException.php
@@ -7,6 +7,9 @@
 
 /**
  * Exception of interaction with Signifyd API
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class ApiCallException extends GatewayException
 {
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/ApiClient.php b/app/code/Magento/Signifyd/Model/SignifydGateway/ApiClient.php
index 2d6d57a510ae3..8ba20d2190490 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/ApiClient.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/ApiClient.php
@@ -9,6 +9,9 @@
 
 /**
  * Encapsulates Signifyd API protocol.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class ApiClient
 {
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Client/HttpClientFactory.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/HttpClientFactory.php
index 2a9b933b98b5d..a7b84a0eb14ad 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/Client/HttpClientFactory.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/HttpClientFactory.php
@@ -13,6 +13,9 @@
 /**
  * Class HttpClientFactory
  * Creates and configures HTTP client for RequestBuilder
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class HttpClientFactory
 {
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Client/RequestBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/RequestBuilder.php
index ee079a74d345f..2b175f73a8fd2 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/Client/RequestBuilder.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/RequestBuilder.php
@@ -8,6 +8,9 @@
 /**
  * Class RequestBuilder
  * Creates HTTP client, sends request to Signifyd and handles response
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class RequestBuilder
 {
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Client/RequestSender.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/RequestSender.php
index a63331e055c1c..dda88c06ac72c 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/Client/RequestSender.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/RequestSender.php
@@ -12,6 +12,9 @@
 /**
  * Class RequestSender
  * Gets HTTP client end sends request to Signifyd API
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class RequestSender
 {
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Client/ResponseHandler.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/ResponseHandler.php
index 614e59b7c29a2..948e727b77569 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/Client/ResponseHandler.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/ResponseHandler.php
@@ -10,6 +10,9 @@
 
 /**
  * Class ResponseHandler
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class ResponseHandler
 {
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/BlackHole.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/BlackHole.php
index 7057313b5e415..5a7679065f6d6 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/BlackHole.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/BlackHole.php
@@ -10,6 +10,9 @@
 /**
  * This debugger ignores any information.
  * Optimal production environment.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class BlackHole implements DebuggerInterface
 {
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/DebuggerFactory.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/DebuggerFactory.php
index 1e61a313899cc..7be4234f392e5 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/DebuggerFactory.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/DebuggerFactory.php
@@ -14,6 +14,9 @@
  * Configuration may be changed by
  *  - config.xml
  *  - at Admin panel (Stores > Configuration > Sales > Fraud Detection > Signifyd > Debug)
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class DebuggerFactory
 {
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/DebuggerInterface.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/DebuggerInterface.php
index f4a2f9cc56a8f..21cec3cf335e0 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/DebuggerInterface.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/DebuggerInterface.php
@@ -9,6 +9,9 @@
 
 /**
  * Interface for debugging interaction with Signifyd API
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 interface DebuggerInterface
 {
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/Log.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/Log.php
index 4b7258180f53e..56efb97112387 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/Log.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/Log.php
@@ -10,6 +10,9 @@
 
 /**
  * Debugger writes information about request, response and possible exception to standard system log.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class Log implements DebuggerInterface
 {
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Gateway.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Gateway.php
index 9f7a053c58724..e191ad32116c4 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/Gateway.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Gateway.php
@@ -13,6 +13,9 @@
  * Signifyd Gateway.
  *
  * Encapsulates interaction with Signifyd API.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class Gateway
 {
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/GatewayException.php b/app/code/Magento/Signifyd/Model/SignifydGateway/GatewayException.php
index 666217f8ccc85..8cbd8b71d8e89 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/GatewayException.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/GatewayException.php
@@ -7,6 +7,9 @@
 
 /**
  * Exception of interaction with Signifyd API
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class GatewayException extends \Exception
 {
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/AddressBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/AddressBuilder.php
index 482f243f6f05d..b5d74ecd7fcad 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/AddressBuilder.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/AddressBuilder.php
@@ -9,6 +9,9 @@
 
 /**
  * Prepare address data
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class AddressBuilder
 {
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CardBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CardBuilder.php
index 5e3a1a83e7aeb..14f90ebe8ecc7 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CardBuilder.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CardBuilder.php
@@ -9,6 +9,9 @@
 
 /**
  * Prepare data related to the card that was used for the purchase and its cardholder.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class CardBuilder
 {
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/ClientVersionBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/ClientVersionBuilder.php
index 8db06473b96d8..159bbcae7e3d6 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/ClientVersionBuilder.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/ClientVersionBuilder.php
@@ -9,6 +9,9 @@
 
 /**
  * Provides platform name, edition and version info
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class ClientVersionBuilder
 {
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CreateCaseBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CreateCaseBuilder.php
index 3e41003d47842..749ef327bd6c3 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CreateCaseBuilder.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CreateCaseBuilder.php
@@ -12,6 +12,8 @@
  *
  * Handles the conversion from Magento Order to Signifyd Case.
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class CreateCaseBuilder implements CreateCaseBuilderInterface
 {
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CreateCaseBuilderInterface.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CreateCaseBuilderInterface.php
index 56662f69e7c5a..56e7cb7614b3e 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CreateCaseBuilderInterface.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/CreateCaseBuilderInterface.php
@@ -9,6 +9,9 @@
  * Collects information about order and build array with parameters required by Signifyd API
  *
  * @see https://www.signifyd.com/docs/api/#/reference/cases/create-a-case
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 interface CreateCaseBuilderInterface
 {
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/PurchaseBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/PurchaseBuilder.php
index 5e544e4b4048e..81350bda9b509 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/PurchaseBuilder.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/PurchaseBuilder.php
@@ -17,6 +17,9 @@
 
 /**
  * Prepare data related to purchase event represented in case creation request.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class PurchaseBuilder
 {
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/RecipientBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/RecipientBuilder.php
index d9d26c8943b88..906fc3328dcec 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/RecipientBuilder.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/RecipientBuilder.php
@@ -9,6 +9,9 @@
 
 /**
  * Prepare data related to person or organization receiving the items purchased
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class RecipientBuilder
 {
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/SellerBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/SellerBuilder.php
index b2cf0401b247f..b7f7f281d5076 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/SellerBuilder.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/SellerBuilder.php
@@ -18,6 +18,9 @@
  *
  * This information is optional unless you are operating a marketplace,
  * listing goods on behalf of multiple sellers who each hold a seller account registered with your site.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class SellerBuilder
 {
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/UserAccountBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/UserAccountBuilder.php
index 0da49b85da869..ad7b1ff490be3 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/UserAccountBuilder.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/UserAccountBuilder.php
@@ -10,6 +10,9 @@
 
 /**
  * Prepares details based on registered user account info
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class UserAccountBuilder
 {
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookMessage.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookMessage.php
index f77db737473c0..ace98bf2dca73 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookMessage.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookMessage.php
@@ -13,6 +13,9 @@
  * They allow your application to receive pushed updates about a case, rather than poll SIGNIFYD for status changes.
  *
  * @see https://www.signifyd.com/docs/api/#/reference/webhooks
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class WebhookMessage
 {
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookMessageReader.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookMessageReader.php
index 50389102359b1..388c2181a69c6 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookMessageReader.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookMessageReader.php
@@ -9,6 +9,9 @@
 
 /**
  * Reads request and produces webhook message data object based on request params.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class WebhookMessageReader
 {
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookRequest.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookRequest.php
index 214ccf0eeb70f..76c7f9c745b3f 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookRequest.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookRequest.php
@@ -9,6 +9,9 @@
 
 /**
  *  Reads Signifyd webhook request data.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class WebhookRequest
 {
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookRequestValidator.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookRequestValidator.php
index 274ef2f854684..48c944860a7c0 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookRequestValidator.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Response/WebhookRequestValidator.php
@@ -11,6 +11,8 @@
 /**
  * Validates webhook request.
  *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class WebhookRequestValidator
 {
diff --git a/app/code/Magento/Signifyd/Model/SignifydOrderSessionId.php b/app/code/Magento/Signifyd/Model/SignifydOrderSessionId.php
index 52746bc4ec6c5..2bf832b92c40c 100644
--- a/app/code/Magento/Signifyd/Model/SignifydOrderSessionId.php
+++ b/app/code/Magento/Signifyd/Model/SignifydOrderSessionId.php
@@ -9,6 +9,9 @@
 
 /**
  * Encapsulates generation of uuid by quote id.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class SignifydOrderSessionId
 {
diff --git a/app/code/Magento/Signifyd/Observer/PlaceOrder.php b/app/code/Magento/Signifyd/Observer/PlaceOrder.php
index 7c451a129cccd..850bac44fe6da 100644
--- a/app/code/Magento/Signifyd/Observer/PlaceOrder.php
+++ b/app/code/Magento/Signifyd/Observer/PlaceOrder.php
@@ -18,6 +18,9 @@
 /**
  * Observer should be triggered when new order is created and placed.
  * If Signifyd integration enabled in configuration then new case will be created.
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class PlaceOrder implements ObserverInterface
 {
diff --git a/app/code/Magento/Signifyd/Plugin/OrderPlugin.php b/app/code/Magento/Signifyd/Plugin/OrderPlugin.php
index 663409d0eb824..63163b595badf 100644
--- a/app/code/Magento/Signifyd/Plugin/OrderPlugin.php
+++ b/app/code/Magento/Signifyd/Plugin/OrderPlugin.php
@@ -13,6 +13,8 @@
  * Plugin for Magento\Sales\Model\Order.
  *
  * @see Order
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class OrderPlugin
 {
diff --git a/app/code/Magento/Signifyd/Plugin/PaymentPlugin.php b/app/code/Magento/Signifyd/Plugin/PaymentPlugin.php
index 17cf4d7e7dbe9..4f68c5bec6373 100644
--- a/app/code/Magento/Signifyd/Plugin/PaymentPlugin.php
+++ b/app/code/Magento/Signifyd/Plugin/PaymentPlugin.php
@@ -13,6 +13,8 @@
  * Plugin for Magento\Payment\Model\MethodInterface.
  *
  * @see MethodInterface
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class PaymentPlugin
 {
diff --git a/app/code/Magento/Signifyd/Ui/Component/Listing/Column/Guarantee/Options.php b/app/code/Magento/Signifyd/Ui/Component/Listing/Column/Guarantee/Options.php
index 1e6234a8e27a9..34ec93dd702f9 100644
--- a/app/code/Magento/Signifyd/Ui/Component/Listing/Column/Guarantee/Options.php
+++ b/app/code/Magento/Signifyd/Ui/Component/Listing/Column/Guarantee/Options.php
@@ -11,6 +11,9 @@
 
 /**
  * Class Options
+ *
+ * @deprecated Starting from Magento 2.3.5 Signifyd core integration is deprecated in favor of
+ * official Signifyd integration available on the marketplace
  */
 class Options implements OptionSourceInterface
 {
diff --git a/app/code/Magento/Signifyd/etc/adminhtml/system.xml b/app/code/Magento/Signifyd/etc/adminhtml/system.xml
index 272ce78aec2e5..5495de50786c5 100644
--- a/app/code/Magento/Signifyd/etc/adminhtml/system.xml
+++ b/app/code/Magento/Signifyd/etc/adminhtml/system.xml
@@ -13,6 +13,7 @@
             <resource>Magento_Sales::fraud_protection</resource>
             <group id="signifyd" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
                 <fieldset_css>signifyd-logo-header</fieldset_css>
+                <comment><![CDATA[<strong style="color:red">Warning!</strong> Signifyd functionality is deprecated and not supported anymore.]]></comment>
                 <group id="about" translate="label comment" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="0">
                     <frontend_model>Magento\Signifyd\Block\Adminhtml\System\Config\Fieldset\Info</frontend_model>
                     <fieldset_css>signifyd-about-header</fieldset_css>

From 20b78b24795fc7358ae294d9ccba6e3a0edf5772 Mon Sep 17 00:00:00 2001
From: Viktor Petryk <victor.petryk@transoftgroup.com>
Date: Wed, 19 Feb 2020 17:39:16 +0200
Subject: [PATCH 4/4] MC-31042: MFTF automated test is flaky when importing CSV

---
 .../AdminCheckDoubleImportOfProductsTest.xml  | 73 -------------------
 .../Model/Import/ProductTest.php              | 73 ++++++++++++++++---
 .../_files/products_with_two_store_views.csv  | 10 +++
 3 files changed, 71 insertions(+), 85 deletions(-)
 delete mode 100644 app/code/Magento/ImportExport/Test/Mftf/Test/AdminCheckDoubleImportOfProductsTest.xml
 create mode 100644 dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_with_two_store_views.csv

diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminCheckDoubleImportOfProductsTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminCheckDoubleImportOfProductsTest.xml
deleted file mode 100644
index 909c6101fe53e..0000000000000
--- a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminCheckDoubleImportOfProductsTest.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminCheckDoubleImportOfProductsTest">
-        <annotations>
-            <description value="Checking double Import of products CSV file"/>
-            <stories value="Import Products"/>
-            <features value="Import/Export"/>
-            <title value="Admin check double import of products test"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-6311"/>
-            <group value="importExport"/>
-        </annotations>
-        <before>
-            <!-- Login as admin -->
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-
-            <!-- Create additional store views -->
-            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createFirstStoreView">
-                <argument name="customStore" value="secondStoreView"/>
-            </actionGroup>
-            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createSecondStoreView">
-                <argument name="customStore" value="thirdStoreView"/>
-            </actionGroup>
-        </before>
-        <after>
-            <!-- Delete all imported products -->
-            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="openProductIndexPage"/>
-            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
-            <actionGroup ref="adminDataGridSelectPerPage" stepKey="selectNumberOfProductsPerPage">
-                <argument name="perPage" value="100"/>
-            </actionGroup>
-            <actionGroup ref="deleteProductsIfTheyExist" stepKey="deleteAllProducts"/>
-
-            <!-- Delete additional store views -->
-            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteFirstStoreView">
-                <argument name="customStore" value="secondStoreView"/>
-            </actionGroup>
-            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteSecondStoreView">
-                <argument name="customStore" value="thirdStoreView"/>
-            </actionGroup>
-
-            <!-- Delete category -->
-            <actionGroup ref="DeleteCategory" stepKey="deleteCategory">
-                <argument name="categoryEntity" value="Gear"/>
-            </actionGroup>
-
-            <!-- Log out -->
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-
-        <!-- Import products with add/update behavior -->
-        <actionGroup ref="AdminImportProductsActionGroup" stepKey="adminImportProductsFirstTime">
-            <argument name="behavior" value="Add/Update"/>
-            <argument name="importFile" value="prepared-for-sample-data.csv"/>
-            <argument name="importNoticeMessage" value="Created: 100, Updated: 3, Deleted: 0"/>
-        </actionGroup>
-
-        <!-- Import products with add/update behavior again -->
-        <actionGroup ref="AdminImportProductsActionGroup" stepKey="adminImportProductsSecondTime">
-            <argument name="behavior" value="Add/Update"/>
-            <argument name="importFile" value="prepared-for-sample-data.csv"/>
-            <argument name="importNoticeMessage" value="Created: 0, Updated: 300, Deleted: 0"/>
-        </actionGroup>
-    </test>
-</tests>
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
index 4c2a52bb51502..9e454d8f2085d 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
@@ -18,6 +18,8 @@
 use Magento\CatalogInventory\Model\Stock;
 use Magento\CatalogInventory\Model\StockRegistry;
 use Magento\CatalogInventory\Model\StockRegistryStorage;
+use Magento\Framework\Api\SearchCriteria;
+use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\App\Bootstrap;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
@@ -25,6 +27,7 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Registry;
+use Magento\ImportExport\Helper\Data;
 use Magento\ImportExport\Model\Import;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
 use Magento\ImportExport\Model\Import\Source\Csv;
@@ -79,6 +82,11 @@ class ProductTest extends \Magento\TestFramework\Indexer\TestCase
      */
     private $logger;
 
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
     /**
      * @var ProductRepositoryInterface
      */
@@ -98,6 +106,7 @@ protected function setUp()
             ['logger' => $this->logger]
         );
         $this->importedProducts = [];
+        $this->searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
         $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
 
         parent::setUp();
@@ -2680,35 +2689,46 @@ public function testImportWithBackordersDisabled(): void
     }
 
     /**
-     * Import file by providing import filename in parameters.
+     * Import file by providing import filename and bunch size.
      *
      * @param string $fileName
-     * @return void
+     * @param int $bunchSize
+     * @return bool
      */
-    private function importFile(string $fileName): void
+    private function importFile(string $fileName, int $bunchSize = 100): bool
     {
-        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
+        $importExportData = $this->getMockBuilder(Data::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $importExportData->expects($this->atLeastOnce())
+            ->method('getBunchSize')
+            ->willReturn($bunchSize);
+        $this->_model = $this->objectManager->create(
+            ImportProduct::class,
+            ['importExportData' => $importExportData]
+        );
+        $filesystem = $this->objectManager->create(Filesystem::class);
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $source = $this->objectManager->create(
-            \Magento\ImportExport\Model\Import\Source\Csv::class,
+            Csv::class,
             [
-                'file' => __DIR__ . '/_files/' . $fileName,
+                'file' => __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . $fileName,
                 'directory' => $directory,
             ]
         );
         $errors = $this->_model->setParameters(
             [
-                'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND,
+                'behavior' => Import::BEHAVIOR_APPEND,
                 'entity' => 'catalog_product',
-                \Magento\ImportExport\Model\Import::FIELDS_ENCLOSURE => 1,
+                Import::FIELDS_ENCLOSURE => 1,
             ]
         )
-        ->setSource($source)
-        ->validateData();
+            ->setSource($source)
+            ->validateData();
 
-        $this->assertTrue($errors->getErrorsCount() == 0);
+        $this->assertTrue($errors->getErrorsCount() === 0);
 
-        $this->_model->importData();
+        return $this->_model->importData();
     }
 
     /**
@@ -3050,4 +3070,33 @@ public function testEmptyAttributeValueShouldBeIgnoredAfterUpdateProductByImport
         $this->assertEquals('Varchar default value', $simpleProduct->getData('varchar_attribute'));
         $this->assertEquals('Short description', $simpleProduct->getData('short_description'));
     }
+
+    /**
+     * Checks possibility to double importing products using the same import file.
+     *
+     * Bunch size is using to test importing the same product that will be chunk to different bunches.
+     * Example:
+     * - first bunch
+     * product-sku,default-store
+     * product-sku,second-store
+     * - second bunch
+     * product-sku,third-store
+     *
+     * @magentoDbIsolation disabled
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
+     * @magentoDataFixture Magento/Store/_files/second_store.php
+     */
+    public function testCheckDoubleImportOfProducts()
+    {
+        /** @var SearchCriteria $searchCriteria */
+        $searchCriteria = $this->searchCriteriaBuilder->create();
+
+        $this->assertEquals(true, $this->importFile('products_with_two_store_views.csv', 2));
+        $productsAfterFirstImport = $this->productRepository->getList($searchCriteria)->getItems();
+        $this->assertEquals(3, count($productsAfterFirstImport));
+
+        $this->assertEquals(true, $this->importFile('products_with_two_store_views.csv', 2));
+        $productsAfterSecondImport = $this->productRepository->getList($searchCriteria)->getItems();
+        $this->assertEquals(3, count($productsAfterSecondImport));
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_with_two_store_views.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_with_two_store_views.csv
new file mode 100644
index 0000000000000..38667c7898160
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_with_two_store_views.csv
@@ -0,0 +1,10 @@
+sku,name,store_view_code,product_type,attribute_set_code,price,custom_options
+simple1,Simple 1,,simple,Default,100,"name=Test Option 1,type=field"
+simple1,Simple 1,fixturestore,simple,Default,,"name=Test Option 1,type=field"
+simple1,Simple 1,fixture_second_store,simple,Default,,"name=Test Option 1,type=field"
+simple2,Simple 2,,simple,Default,200,"name=Test Option 1,type=field"
+simple2,Simple 2,fixturestore,simple,Default,,"name=Test Option 1,type=field"
+simple2,Simple 2,fixture_second_store,simple,Default,,"name=Test Option 1,type=field"
+simple3,Simple 3,,simple,Default,300,"name=Test Option 1,type=field"
+simple3,Simple 3,fixturestore,simple,Default,,"name=Test Option 1,type=field"
+simple3,Simple 3,fixture_second_store,simple,Default,,"name=Test Option 1,type=field"