diff --git a/app/code/Magento/Bundle/Model/Product/SaveHandler.php b/app/code/Magento/Bundle/Model/Product/SaveHandler.php
index 1db7a0774c4547cd2dfa502252f9441cc8dc2879..6ff6356fbb890a6eeae85f9f566f1fdac86f5ee5 100644
--- a/app/code/Magento/Bundle/Model/Product/SaveHandler.php
+++ b/app/code/Magento/Bundle/Model/Product/SaveHandler.php
@@ -49,7 +49,8 @@ class SaveHandler implements ExtensionInterface
     /**
      * @param string $entityType
      * @param object $entity
-     * @return object
+     * @param array $arguments
+     * @return \Magento\Catalog\Api\Data\ProductInterface|object
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($entityType, $entity, $arguments = [])
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php b/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php
index 14e45a0303fb8b21cdf276c8b90e6f9ca5a3a658..527caa14c8b974b6888f670133a56d7ee3952361 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php
@@ -92,6 +92,7 @@ class CreateHandler implements ExtensionInterface
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function execute($entityType, $product, $arguments = [])
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php b/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
index 748ee192afb6ccc17345d6eeed1034c4c5b98eb0..37f9afbcb82b9a5d2b8b250e24abc4ff7d57a9f0 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
@@ -9,6 +9,7 @@ namespace Magento\Catalog\Model\Product\Option;
 use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface as OptionRepository;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\EntityManager\Operation\ExtensionInterface;
+
 /**
  * Class SaveHandler
  */
diff --git a/app/code/Magento/Catalog/Model/ProductRepository.php b/app/code/Magento/Catalog/Model/ProductRepository.php
index c50abe566b3f0262255cf9345bbb083708cc80c7..3ede667ea2a1ecaeef4f1e9ce66727f592145061 100644
--- a/app/code/Magento/Catalog/Model/ProductRepository.php
+++ b/app/code/Magento/Catalog/Model/ProductRepository.php
@@ -510,7 +510,6 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
             $productLinks = $product->getProductLinks();
         }
         $productDataArray['store_id'] = (int)$this->storeManager->getStore()->getId();
-//        $product = $this->initializeProductData($productDataArray, empty($existingProduct));
 
         $this->processLinks($product, $productLinks);
         if (isset($productDataArray['media_gallery_entries'])) {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductLink/RepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductLink/RepositoryTest.php
index 1991e77a14cc627b74bb9a008c0ae9d586a89bd6..a57a461960c16b8b326759516963d4777c8a7d49 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductLink/RepositoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductLink/RepositoryTest.php
@@ -61,11 +61,6 @@ class RepositoryTest extends \PHPUnit_Framework_TestCase
      */
     protected $linkInitializerMock;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $mediaGalleryProcessorMock;
-
     /**
      * Test method
      */
diff --git a/app/code/Magento/Catalog/etc/di.xml b/app/code/Magento/Catalog/etc/di.xml
index 533850b736f50b1173ec791e9dfa45dbb3e71e73..2827545c44e908952a109c854eab2577808735c2 100644
--- a/app/code/Magento/Catalog/etc/di.xml
+++ b/app/code/Magento/Catalog/etc/di.xml
@@ -555,9 +555,9 @@
             <argument name="operations" xsi:type="array">
                 <item name="default" xsi:type="array">
                     <item name="read" xsi:type="string">Magento\Framework\Model\Operation\Read</item>
-                    <item name="create" xsi:type="string">Magento\Framework\Model\Operation\Write\Create</item>
-                    <item name="update" xsi:type="string">Magento\Framework\Model\Operation\Write\Update</item>
-                    <item name="delete" xsi:type="string">Magento\Framework\Model\Operation\Write\Delete</item>
+                    <item name="create" xsi:type="string">Magento\Framework\EntityManager\Operation\Write\Create</item>
+                    <item name="update" xsi:type="string">Magento\Framework\EntityManager\Operation\Write\Update</item>
+                    <item name="delete" xsi:type="string">Magento\Framework\EntityManager\Operation\Write\Delete</item>
                 </item>
             </argument>
         </arguments>
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Export/ProductTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Export/ProductTest.php
index ee6bf4edcdc12c04171b4db0611dd7db2d605930..aa2c55961c1dd0f91511273962d00754c08a1406 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Export/ProductTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Export/ProductTest.php
@@ -113,7 +113,6 @@ class ProductTest extends \PHPUnit_Framework_TestCase
      */
     protected $product;
 
-
     /**
      * @var StubProduct|\Magento\CatalogImportExport\Model\Export\Product
      */
diff --git a/app/code/Magento/CatalogRule/Model/ResourceModel/Rule.php b/app/code/Magento/CatalogRule/Model/ResourceModel/Rule.php
index 5574212ebfddede949e351b7ba783b6d2705037d..cb64f36dd8b5c4b5435d453cd8830009baf1bfaf 100644
--- a/app/code/Magento/CatalogRule/Model/ResourceModel/Rule.php
+++ b/app/code/Magento/CatalogRule/Model/ResourceModel/Rule.php
@@ -244,7 +244,8 @@ class Rule extends \Magento\Rule\Model\ResourceModel\AbstractResource
     public function save(\Magento\Framework\Model\AbstractModel $object)
     {
         $this->entityManager->save(
-            $object, \Magento\CatalogRule\Api\Data\RuleInterface::class
+            $object,
+            \Magento\CatalogRule\Api\Data\RuleInterface::class
         );
         return $this;
     }
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Filter/PreprocessorTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Filter/PreprocessorTest.php
index 39c29a0a0da9beac35729f3ba7caa88d2747bedf..b34e604f3312fca56c8ccf40eb4a95df6cd7fdaa 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Filter/PreprocessorTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Filter/PreprocessorTest.php
@@ -21,6 +21,7 @@ class PreprocessorTest extends \PHPUnit_Framework_TestCase
      * @var \Magento\CatalogSearch\Model\Search\TableMapper|\PHPUnit_Framework_MockObject_MockObject
      */
     private $tableMapper;
+
     /**
      * @var \Magento\Framework\DB\Adapter\AdapterInterface|MockObject
      */
diff --git a/app/code/Magento/Cms/Model/ResourceModel/Block.php b/app/code/Magento/Cms/Model/ResourceModel/Block.php
index 9ddf26aa2f0d419b39f8cf5d77a23977d441f1d3..7be9bca21b55fe5b06d7bdc344954bddd17ab40e 100644
--- a/app/code/Magento/Cms/Model/ResourceModel/Block.php
+++ b/app/code/Magento/Cms/Model/ResourceModel/Block.php
@@ -96,7 +96,7 @@ class Block extends AbstractDb
 
     /**
      * @param AbstractModel $object
-     * @param $value
+     * @param mixed $value
      * @param null $field
      * @return bool|int|string
      * @throws LocalizedException
diff --git a/app/code/Magento/Cms/Model/ResourceModel/Block/Grid/Collection.php b/app/code/Magento/Cms/Model/ResourceModel/Block/Grid/Collection.php
index 3de69c97fd286a9abc01323c615cd2f7751728ab..66e4db37f32976babe75ac5e6d20db7be78425a7 100644
--- a/app/code/Magento/Cms/Model/ResourceModel/Block/Grid/Collection.php
+++ b/app/code/Magento/Cms/Model/ResourceModel/Block/Grid/Collection.php
@@ -84,7 +84,6 @@ class Collection extends BlockCollection implements SearchResultInterface
         $this->aggregations = $aggregations;
     }
 
-
     /**
      * Retrieve all ids for collection
      * Backward compatibility with EAV collection
diff --git a/app/code/Magento/Downloadable/Model/Sample/ReadHandler.php b/app/code/Magento/Downloadable/Model/Sample/ReadHandler.php
index 9c579150ac72011d9cf19c3cc2c5ec7efcc592e0..d4ff74d056e23e6920390718cd70d5d0bddb168b 100644
--- a/app/code/Magento/Downloadable/Model/Sample/ReadHandler.php
+++ b/app/code/Magento/Downloadable/Model/Sample/ReadHandler.php
@@ -27,12 +27,6 @@ class ReadHandler implements ExtensionInterface
         $this->sampleRepository = $sampleRepository;
     }
 
-    /**
-     * @param string $entityType
-     * @param object $entity
-     * @return \Magento\Catalog\Api\Data\ProductInterface
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
     /**
      * @param string $entityType
      * @param object $entity
diff --git a/app/code/Magento/Eav/Model/ResourceModel/CreateHandler.php b/app/code/Magento/Eav/Model/ResourceModel/CreateHandler.php
index b5bd30e1575d44bd4bdc1c3154dd2953fa1552f8..c988700ee94b33d17fd3f77e26f8f3ac687fab87 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/CreateHandler.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/CreateHandler.php
@@ -81,8 +81,8 @@ class CreateHandler implements AttributeInterface
     }
 
     /**
-     * @param $entityType
-     * @param $entityData
+     * @param string $entityType
+     * @param array $entityData
      * @param array $arguments
      * @return array
      * @throws \Exception
diff --git a/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/CreateHandler.php b/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/CreateHandler.php
index 1604c3675764bbdaff53e5627f4297f243d8aa77..3b88374a634d744a9a021f31c656d9e3a0d8abda 100644
--- a/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/CreateHandler.php
+++ b/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/CreateHandler.php
@@ -22,12 +22,15 @@ class CreateHandler extends AbstractHandler
      * @param \Magento\Catalog\Model\Product\Gallery\CreateHandler $mediaGalleryCreateHandler
      * @param string $entityType
      * @param \Magento\Catalog\Model\Product $product
-     * @return array
+     * @param array $arguments
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function beforeExecute(
         \Magento\Catalog\Model\Product\Gallery\CreateHandler $mediaGalleryCreateHandler,
         $entityType,
-        \Magento\Catalog\Model\Product $product
+        \Magento\Catalog\Model\Product $product,
+        array $arguments = []
     ) {
         $attribute = $mediaGalleryCreateHandler->getAttribute();
         $mediaCollection = $this->getMediaEntriesDataCollection($product, $attribute);
@@ -39,8 +42,6 @@ class CreateHandler extends AbstractHandler
                 $mediaCollection + $product->getData($attribute->getAttributeCode())
             );
         }
-
-        return [$entityType, $product];
     }
 
     /**
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/ReadHandlerTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/ReadHandlerTest.php
index 681647d5d19899e6c47491e4e429ea90500a9ff9..f8743b736ee7f4b1d6ca35f231483477293b381d 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/ReadHandlerTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/ReadHandlerTest.php
@@ -19,6 +19,7 @@ class ReadHandlerTest extends \PHPUnit_Framework_TestCase
      * @var \Magento\SalesRule\Model\ResourceModel\ReadHandler
      */
     protected $model;
+
     /**
      * @var Rule|\PHPUnit_Framework_MockObject_MockObject
      */
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/SaveHandlerTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/SaveHandlerTest.php
index a3041140a0a60733ee6fd6f587ca5b34a76d7a1d..5dfda4e11835f84a6c376b862551c674e9c1954c 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/SaveHandlerTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/SaveHandlerTest.php
@@ -19,6 +19,7 @@ class SaveHandlerTest extends \PHPUnit_Framework_TestCase
      * @var SaveHandler
      */
     protected $model;
+
     /**
      * @var Rule|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -93,8 +94,6 @@ class SaveHandlerTest extends \PHPUnit_Framework_TestCase
             'customer_group_ids' => $customers
         ];
 
-
-
         $className = '\Magento\Framework\EntityManager\EntityMetadata';
         $metadata = $this->getMock($className, [], [], '', false);
 
diff --git a/lib/internal/Magento/Framework/EntityManager/Db/CreateRow.php b/lib/internal/Magento/Framework/EntityManager/Db/CreateRow.php
index 6a44569c939d5eb392dfb3f571c30ded8956000f..20d102cb4e992cb89633ec2c2bd98503466c8bdb 100644
--- a/lib/internal/Magento/Framework/EntityManager/Db/CreateRow.php
+++ b/lib/internal/Magento/Framework/EntityManager/Db/CreateRow.php
@@ -11,7 +11,6 @@ use Magento\Framework\EntityManager\EntityMetadataInterface;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\App\ResourceConnection;
 
-
 /**
  * Class CreateRow
  */
diff --git a/lib/internal/Magento/Framework/EntityManager/Db/DeleteRow.php b/lib/internal/Magento/Framework/EntityManager/Db/DeleteRow.php
index 469ce93ec2bb54c82c9c5238b5946f0bb0fca8b6..6b526e1964c1f83a3a3e1c0fa42355891d908809 100644
--- a/lib/internal/Magento/Framework/EntityManager/Db/DeleteRow.php
+++ b/lib/internal/Magento/Framework/EntityManager/Db/DeleteRow.php
@@ -9,7 +9,6 @@ namespace Magento\Framework\EntityManager\Db;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\App\ResourceConnection;
 
-
 /**
  * Class DeleteRow
  */
diff --git a/lib/internal/Magento/Framework/EntityManager/Db/ReadRow.php b/lib/internal/Magento/Framework/EntityManager/Db/ReadRow.php
index ed69238cb67721532dd85a57be33b96ab4cfa2a4..9abfdd25cc627f60d63c17e0ddd1fb2f61c1ffed 100644
--- a/lib/internal/Magento/Framework/EntityManager/Db/ReadRow.php
+++ b/lib/internal/Magento/Framework/EntityManager/Db/ReadRow.php
@@ -9,7 +9,6 @@ namespace Magento\Framework\EntityManager\Db;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\App\ResourceConnection;
 
-
 /**
  * Class DeleteRow
  */
diff --git a/lib/internal/Magento/Framework/EntityManager/Db/UpdateRow.php b/lib/internal/Magento/Framework/EntityManager/Db/UpdateRow.php
index acd2267e06825b338d55a168398199c8c4c55a97..07e0afd9908d59d85ff2004557cc9e19e05d3be7 100644
--- a/lib/internal/Magento/Framework/EntityManager/Db/UpdateRow.php
+++ b/lib/internal/Magento/Framework/EntityManager/Db/UpdateRow.php
@@ -11,7 +11,6 @@ use Magento\Framework\EntityManager\EntityMetadataInterface;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\App\ResourceConnection;
 
-
 /**
  * Class UpdateRow
  */
@@ -51,7 +50,6 @@ class UpdateRow
     {
         $output = [];
         foreach ($connection->describeTable($metadata->getEntityTable()) as $column) {
-
             if ($column['DEFAULT'] == 'CURRENT_TIMESTAMP' || $column['IDENTITY']) {
                 continue;
             }
diff --git a/lib/internal/Magento/Framework/EntityManager/EntityHydrator.php b/lib/internal/Magento/Framework/EntityManager/EntityHydrator.php
deleted file mode 100644
index 3376e3a402744add98130fb9665c9e2715d74daa..0000000000000000000000000000000000000000
--- a/lib/internal/Magento/Framework/EntityManager/EntityHydrator.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\EntityManager;
-
-/**
- * Class EntityHydrator
- */
-class EntityHydrator implements EntityHydratorInterface
-{
-    public function extract($entity)
-    {
-        // TODO: Implement extract() method.
-    }
-
-    public function hydrate($entity, array $data)
-    {
-        // TODO: Implement hydrate() method.
-    }
-}
diff --git a/lib/internal/Magento/Framework/EntityManager/EntityManager.php b/lib/internal/Magento/Framework/EntityManager/EntityManager.php
index 798d735f3e481ca7b56db518f33b39d25bbaa8b1..52bb00ccfe82de528aa35d2a7d49a005da4e14b7 100644
--- a/lib/internal/Magento/Framework/EntityManager/EntityManager.php
+++ b/lib/internal/Magento/Framework/EntityManager/EntityManager.php
@@ -72,7 +72,7 @@ class EntityManager
             $operation = $this->operationPool->getOperation($entityType, 'create');
         }
         try {
-        $entity = $operation->execute($entityType, $entity, $arguments);
+            $entity = $operation->execute($entityType, $entity, $arguments);
             $this->callbackHandler->process($entityType);
         } catch (\Exception $e) {
             $this->callbackHandler->clear($entityType);
diff --git a/lib/internal/Magento/Framework/EntityManager/EntityMetadata.php b/lib/internal/Magento/Framework/EntityManager/EntityMetadata.php
index d86a589af242eec0b2f60e4ae434d7c0f2e89bf4..a906c0ed69135a611601fbc30a830d24b75a5292 100644
--- a/lib/internal/Magento/Framework/EntityManager/EntityMetadata.php
+++ b/lib/internal/Magento/Framework/EntityManager/EntityMetadata.php
@@ -14,7 +14,6 @@ use Magento\Framework\DB\Sequence\SequenceInterface;
  */
 class EntityMetadata implements EntityMetadataInterface
 {
-
     /**
      * @var ResourceConnection
      */
@@ -54,8 +53,8 @@ class EntityMetadata implements EntityMetadataInterface
      * EntityMetadata constructor.
      *
      * @param ResourceConnection $resourceConnection
-     * @param $entityTableName
-     * @param $identifierField
+     * @param string $entityTableName
+     * @param string $identifierField
      * @param SequenceInterface|null $sequence
      * @param null $eavEntityType
      * @param null $connectionName
diff --git a/lib/internal/Magento/Framework/EntityManager/EventManager.php b/lib/internal/Magento/Framework/EntityManager/EventManager.php
index 44d4d02100a0afa19d4676acadf5fa17ebb91f36..75975192ba9f34f0c673a920d3498ddbca8d4893 100644
--- a/lib/internal/Magento/Framework/EntityManager/EventManager.php
+++ b/lib/internal/Magento/Framework/EntityManager/EventManager.php
@@ -13,8 +13,15 @@ use Magento\Framework\Event\ManagerInterface;
  */
 class EventManager
 {
+    /**
+     * @var ManagerInterface
+     */
     private $eventManager;
 
+    /**
+     * EventManager constructor.
+     * @param ManagerInterface $eventManager
+     */
     public function __construct(
         ManagerInterface $eventManager
     ) {
@@ -36,6 +43,7 @@ class EventManager
      * @param string $entityType
      * @param string $eventSuffix
      * @param array $data
+     * @return void
      */
     public function dispatchEntityEvent($entityType, $eventSuffix, array $data = [])
     {
@@ -48,9 +56,10 @@ class EventManager
     /**
      * @param string $eventName
      * @param array $data
+     * @return void
      */
     public function dispatch($eventName, array $data = [])
     {
         $this->eventManager->dispatch($eventName, $data);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/internal/Magento/Framework/EntityManager/HydratorPool.php b/lib/internal/Magento/Framework/EntityManager/HydratorPool.php
index f533787d6373f295462b0231305d7906eab45955..580ba32a81ea04d47145def206eddc4782ea79f8 100644
--- a/lib/internal/Magento/Framework/EntityManager/HydratorPool.php
+++ b/lib/internal/Magento/Framework/EntityManager/HydratorPool.php
@@ -14,7 +14,7 @@ use Magento\Framework\ObjectManagerInterface;
 class HydratorPool
 {
     /**
-     * @var
+     * @var array|\string[]
      */
     private $hydrators;
 
diff --git a/lib/internal/Magento/Framework/EntityManager/MetadataPool.php b/lib/internal/Magento/Framework/EntityManager/MetadataPool.php
index 64547b22bc9ef7798480f72565dd25664175927c..9dd87b87054641cd85ab3748964682cc62a59fb9 100644
--- a/lib/internal/Magento/Framework/EntityManager/MetadataPool.php
+++ b/lib/internal/Magento/Framework/EntityManager/MetadataPool.php
@@ -97,7 +97,7 @@ class MetadataPool
     }
 
     /**
-     * @param $entityType
+     * @param string $entityType
      * @deprecated
      * @return EntityHydratorInterface
      */
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/ExtensionInterface.php b/lib/internal/Magento/Framework/EntityManager/Operation/ExtensionInterface.php
index e5c4ca438b2718b5ab3c9c8ac582a24b7f033423..b4278aeb9a85d575d8082ce828acb62fc77cad88 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/ExtensionInterface.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/ExtensionInterface.php
@@ -18,4 +18,4 @@ interface ExtensionInterface
      * @return object|bool
      */
     public function execute($entityType, $entity, $arguments = []);
-}
\ No newline at end of file
+}
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/Read/CheckIsExists.php b/lib/internal/Magento/Framework/EntityManager/Operation/Read/CheckIsExists.php
index ed49054c9c3d1a6cca3df82affa7197db72d6a3a..068b33b405e94debc3ad4d7952f210abc98b1865 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/Read/CheckIsExists.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/Read/CheckIsExists.php
@@ -53,6 +53,7 @@ class CheckIsExists
      * @param array $arguments
      * @return bool
      * @throws \Exception
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($entityType, $entity, $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/Write/Create/CreateMain.php b/lib/internal/Magento/Framework/EntityManager/Operation/Write/Create/CreateMain.php
index 6367e86b1c66228eb7448e983562889c0f79e80d..21b0bf62c5cac7ce2e66d6ec45d11d0c3b008391 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/Write/Create/CreateMain.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/Write/Create/CreateMain.php
@@ -41,6 +41,7 @@ class CreateMain
     /**
      * @param string $entityType
      * @param object $entity
+     * @param array $arguments
      * @return object
      */
     public function execute($entityType, $entity, $arguments = [])
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/Write/Delete/DeleteMain.php b/lib/internal/Magento/Framework/EntityManager/Operation/Write/Delete/DeleteMain.php
index fe4907baee6ba501550afe7e6f57d463cc893f2a..869e8de684957957f125db27cdbb139a6eb7abe1 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/Write/Delete/DeleteMain.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/Write/Delete/DeleteMain.php
@@ -43,6 +43,7 @@ class DeleteMain
      * @param object $entity
      * @param array $arguments
      * @return object
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($entityType, $entity, $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/Write/Update/UpdateExtensions.php b/lib/internal/Magento/Framework/EntityManager/Operation/Write/Update/UpdateExtensions.php
index 0492c84046c9fdb216e8ad1b12c36dad797159ed..509b02ecd797137d4263ed1e9e6f4bcd3104c171 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/Write/Update/UpdateExtensions.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/Write/Update/UpdateExtensions.php
@@ -33,6 +33,7 @@ class UpdateExtensions
      * @param object $entity
      * @param array $arguments
      * @return object
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($entityType, $entity, $arguments = [])
     {
diff --git a/lib/internal/Magento/Framework/EntityManager/README.md b/lib/internal/Magento/Framework/EntityManager/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..8ee8c2d3eff6511d65bee78e56a4605c320da880
--- /dev/null
+++ b/lib/internal/Magento/Framework/EntityManager/README.md
@@ -0,0 +1,4 @@
+# EntityManager
+
+**EntityManager** library contains functionality for management entity instances.
+It includes read and write operations as for entity as for their attributes and extensions.
\ No newline at end of file
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/ValidateDataIntegrity.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/ValidateDataIntegrity.php
index 8dda7cb4a751ed59385c446bfe7590a3c18d32c1..9fdb0a1232906083c332e033fa1729360279a964 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/ValidateDataIntegrity.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/ValidateDataIntegrity.php
@@ -50,6 +50,7 @@ class ValidateDataIntegrity
      * @param string $entityType
      * @param object $entity
      * @throws \Exception
+     * @return void
      */
     public function execute($entityType, $entity)
     {