diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
index fce69f5f523d68addf247ad2455c45421e69451f..377eb631104047042f1ba0b533383deffbb67a2d 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
@@ -467,7 +467,7 @@ class AbstractAction
     }
 
     /**
-     * @return \Magento\Framework\Model\Entity\EntityMetadata
+     * @return \Magento\Framework\EntityManager\EntityMetadata
      */
     private function getCategoryMetadata()
     {
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 ec15e34a0b670681e4d5764ccc87127e5111994f..1991e77a14cc627b74bb9a008c0ae9d586a89bd6 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductLink/RepositoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductLink/RepositoryTest.php
@@ -169,6 +169,7 @@ class RepositoryTest extends \PHPUnit_Framework_TestCase
         $entityMock->expects($this->once())->method('getSku')->willReturn('product');
         $entityMock->expects($this->exactly(1))->method('getLinkType')->willReturn('linkType');
         $this->linkTypeProvider->expects($this->once())->method('getLinkTypes')->willReturn(['linkType' => $typeId]);
+        $this->metadataPoolMock->expects($this->once())->method('getHydrator')->willReturn($this->hydratorMock);
         $this->metadataMock->expects($this->once())->method('getLinkField')->willReturn('linkField');
         $this->hydratorMock->expects($this->once())->method('extract')
             ->with($productMock)
@@ -204,6 +205,7 @@ class RepositoryTest extends \PHPUnit_Framework_TestCase
         $entityMock->expects($this->once())->method('getSku')->willReturn('product');
         $entityMock->expects($this->exactly(1))->method('getLinkType')->willReturn('linkType');
         $this->linkTypeProvider->expects($this->once())->method('getLinkTypes')->willReturn(['linkType' => $typeId]);
+        $this->metadataPoolMock->expects($this->once())->method('getHydrator')->willReturn($this->hydratorMock);
         $this->metadataMock->expects($this->once())->method('getLinkField')->willReturn('linkField');
         $this->hydratorMock->expects($this->once())->method('extract')
             ->with($productMock)
@@ -238,6 +240,7 @@ class RepositoryTest extends \PHPUnit_Framework_TestCase
         $entityMock->expects($this->once())->method('getSku')->willReturn('product');
         $entityMock->expects($this->exactly(1))->method('getLinkType')->willReturn('linkType');
         $this->linkTypeProvider->expects($this->once())->method('getLinkTypes')->willReturn(['linkType' => $typeId]);
+        $this->metadataPoolMock->expects($this->once())->method('getHydrator')->willReturn($this->hydratorMock);
         $this->metadataMock->expects($this->once())->method('getLinkField')->willReturn('linkField');
         $this->hydratorMock->expects($this->once())->method('extract')
             ->with($productMock)
@@ -274,6 +277,7 @@ class RepositoryTest extends \PHPUnit_Framework_TestCase
         $entityMock->expects($this->once())->method('getSku')->willReturn('product');
         $entityMock->expects($this->exactly(1))->method('getLinkType')->willReturn('linkType');
         $this->linkTypeProvider->expects($this->once())->method('getLinkTypes')->willReturn(['linkType' => $typeId]);
+        $this->metadataPoolMock->expects($this->once())->method('getHydrator')->willReturn($this->hydratorMock);
         $this->metadataMock->expects($this->once())->method('getLinkField')->willReturn('linkField');
         $this->hydratorMock->expects($this->once())->method('extract')
             ->with($productMock)
@@ -306,6 +310,7 @@ class RepositoryTest extends \PHPUnit_Framework_TestCase
         $entityMock->expects($this->exactly(2))->method('getLinkedProductSku')->willReturn('linkedProduct');
         $entityMock->expects($this->exactly(2))->method('getSku')->willReturn('product');
         $entityMock->expects($this->once())->method('getLinkType')->willReturn('linkType');
+        $this->metadataPoolMock->expects($this->once())->method('getHydrator')->willReturn($this->hydratorMock);
         $this->model->delete($entityMock);
     }
 }
diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/ResourceModel/Item/CollectionTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/ResourceModel/Item/CollectionTest.php
index c94b21006d545fc7342c21127631847704a2ea4c..d3efdccb8d4a3e35866da101dff726cf76832d7a 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Model/ResourceModel/Item/CollectionTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Model/ResourceModel/Item/CollectionTest.php
@@ -197,7 +197,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
 
     public function testAddProductNameFilter()
     {
-        $entityMetadata = $this->getMockBuilder('Magento\Framework\Model\Entity\EntityMetadata')
+        $entityMetadata = $this->getMockBuilder('Magento\Framework\EntityManager\EntityMetadata')
             ->disableOriginalConstructor()
             ->getMock();
         $entityMetadata->expects($this->once())
diff --git a/lib/internal/Magento/Framework/EntityManager/Db/UpdateRow.php b/lib/internal/Magento/Framework/EntityManager/Db/UpdateRow.php
index 8be26da50deb71a56bceb46b4a5cbb706c5d0d4d..acd2267e06825b338d55a168398199c8c4c55a97 100644
--- a/lib/internal/Magento/Framework/EntityManager/Db/UpdateRow.php
+++ b/lib/internal/Magento/Framework/EntityManager/Db/UpdateRow.php
@@ -52,13 +52,11 @@ class UpdateRow
         $output = [];
         foreach ($connection->describeTable($metadata->getEntityTable()) as $column) {
 
-            if ($column['DEFAULT'] == 'CURRENT_TIMESTAMP'|| $column['IDENTITY']) {
+            if ($column['DEFAULT'] == 'CURRENT_TIMESTAMP' || $column['IDENTITY']) {
                 continue;
             }
             if (isset($data[strtolower($column['COLUMN_NAME'])])) {
                 $output[strtolower($column['COLUMN_NAME'])] = $data[strtolower($column['COLUMN_NAME'])];
-            } elseif ($column['DEFAULT'] === null) {
-                $output[strtolower($column['COLUMN_NAME'])] = null;
             }
         }
         if (empty($data[$metadata->getIdentifierField()])) {