diff --git a/app/code/Magento/Sitemap/Model/ResourceModel/Cms/Page.php b/app/code/Magento/Sitemap/Model/ResourceModel/Cms/Page.php
index 66e5d05f9ee710b6cdc04762aee74e2404eea954..c703658461c54993c7c72ecd0416b47af78ced7e 100644
--- a/app/code/Magento/Sitemap/Model/ResourceModel/Cms/Page.php
+++ b/app/code/Magento/Sitemap/Model/ResourceModel/Cms/Page.php
@@ -149,7 +149,7 @@ class Page extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
         }
 
         if ($isId) {
-            $this->entityManager->load(PageInterface::class, $object, $value);
+            $this->entityManager->load($object, $value, PageInterface::class);
         }
         return $this;
     }
diff --git a/lib/internal/Magento/Framework/EntityManager/Observer/AfterEntitySave.php b/lib/internal/Magento/Framework/EntityManager/Observer/AfterEntitySave.php
index da9ae0e7ddf42a7fc2320ecefba3a382a7b71a0a..9ca4a894739aeb9faa4b7b8aa0865cb4c4a2cde8 100644
--- a/lib/internal/Magento/Framework/EntityManager/Observer/AfterEntitySave.php
+++ b/lib/internal/Magento/Framework/EntityManager/Observer/AfterEntitySave.php
@@ -27,6 +27,9 @@ class AfterEntitySave implements ObserverInterface
     {
         $entity = $observer->getEvent()->getEntity();
         if ($entity instanceof AbstractModel) {
+            if (method_exists($entity->getResource(), 'loadAllAttributes')) {
+                $entity->getResource()->loadAllAttributes();
+            }
             $entity->getResource()->afterSave($entity);
             $entity->afterSave();
             $entity->getResource()->addCommitCallback([$entity, 'afterCommitCallback']);