diff --git a/app/code/Magento/Eav/Model/Entity/Type.php b/app/code/Magento/Eav/Model/Entity/Type.php
index 7318e443fe3ada57c0b331ef48324ed4b6013521..6b3547a4f4b9828d126305820b8f4d8644a59849 100644
--- a/app/code/Magento/Eav/Model/Entity/Type.php
+++ b/app/code/Magento/Eav/Model/Entity/Type.php
@@ -278,7 +278,11 @@ class Type extends \Magento\Framework\Model\AbstractModel
      */
     public function getEntityTable()
     {
-        return isset($this->_data['entity_table']) ? $this->_data['entity_table'] : null;
+        if (isset($this->_data['entity_table'])) {
+            return $this->getResource()->getTable($this->_data['entity_table']);
+        }
+
+        return null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/Filter/Date.php b/lib/internal/Magento/Framework/Stdlib/DateTime/Filter/Date.php
index 3f0749c5b9573ed64557f0959682cc71ea1a70c4..43c05e99084b505d2b88a25f97fb80ff8d6bb0c8 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime/Filter/Date.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/Filter/Date.php
@@ -52,6 +52,11 @@ class Date implements \Zend_Filter_Interface
      */
     public function filter($value)
     {
-        return $this->_normalToLocalFilter->filter($this->_localToNormalFilter->filter($value));
+        $value = $this->_normalToLocalFilter->filter($this->_localToNormalFilter->filter($value));
+
+        /**
+         * @todo MAGETWO-51391
+         */
+        return str_replace("\xc2\xa0", '', $value);
     }
 }