diff --git a/core/lib/Drupal/Core/Entity/ContentEntityBase.php b/core/lib/Drupal/Core/Entity/ContentEntityBase.php
index 846e89a..f3985eb 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityBase.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityBase.php
@@ -1099,15 +1099,12 @@ public function __clone() {
 
       // Ensure that the following properties are actually cloned by
       // overwriting the original references with ones pointing to copies of
-      // them: enforceIsNew, newRevision and loadedRevisionId.
-      $enforce_is_new = $this->enforceIsNew;
-      $this->enforceIsNew = &$enforce_is_new;
-
-      $new_revision = $this->newRevision;
-      $this->newRevision = &$new_revision;
-
-      $original_revision_id = $this->loadedRevisionId;
-      $this->loadedRevisionId = &$original_revision_id;
+      // them.
+      $properties_to_clone = ['values', 'enforceIsNew', 'newRevision', 'loadedRevisionId', 'values', 'entityKeys', 'translatableEntityKeys'];
+      foreach ($properties_to_clone as $property_name) {
+        $property_value = $this->$property_name;
+        $this->$property_name = &$property_value;
+      }
     }
   }