diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
index 5d1bc29..2196cfe 100644
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
@@ -591,22 +591,35 @@ protected function getEntitySchemaTables() {
    *   storage definitions.
    */
   protected function getEntitySchemaData(ContentEntityTypeInterface $entity_type, array $schema) {
-    $schema_data = array();
     $entity_type_id = $entity_type->id();
     $keys = array('indexes', 'unique keys');
     $unused_keys = array_flip(array('description', 'fields', 'foreign keys'));
 
+    // Collect all possible field schema identifiers for shared table fields.
+    // These will be used to detect entity schema data in the subsequent loop.
+    $field_schema_identifiers = [];
+    $storage_definitions = $this->entityManager->getFieldStorageDefinitions($entity_type_id);
+    $table_mapping = $this->storage->getTableMapping($storage_definitions);
+    foreach ($storage_definitions as $field_name => $storage_definition) {
+      if ($table_mapping->allowsSharedTableStorage($storage_definition)) {
+        // Make sure both base identifier names and suffixed names are listed.
+        $name = $this->getFieldSchemaIdentifierName($entity_type_id, $field_name);
+        $field_schema_identifiers[$name] = $name;
+        foreach ($storage_definition->getColumns() as $key => $columns) {
+          $name = $this->getFieldSchemaIdentifierName($entity_type_id, $field_name, $key);
+          $field_schema_identifiers[$name] = $name;
+        }
+      }
+    }
+
+    $schema_data = [];
     foreach ($schema as $table_name => $table_schema) {
       $table_schema = array_diff_key($table_schema, $unused_keys);
       foreach ($keys as $key) {
         // Exclude data generated from field storage definitions, we will check
         // that separately.
-        if (!empty($table_schema[$key])) {
-          $data_keys = array_keys($table_schema[$key]);
-          $entity_keys = array_filter($data_keys, function ($key) use ($entity_type_id) {
-            return strpos($key, $entity_type_id . '_field__') !== 0;
-          });
-          $table_schema[$key] = array_intersect_key($table_schema[$key], array_flip($entity_keys));
+        if ($field_schema_identifiers && !empty($table_schema[$key])) {
+          $table_schema[$key] = array_diff_key($table_schema[$key], $field_schema_identifiers);
         }
       }
       $schema_data[$table_name] = array_filter($table_schema);
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationEnableTest.php b/core/modules/content_translation/src/Tests/ContentTranslationEnableTest.php
new file mode 100644
index 0000000..3bae1de
--- /dev/null
+++ b/core/modules/content_translation/src/Tests/ContentTranslationEnableTest.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\content_translation\Tests\ContentTranslationEnableTest.
+ */
+
+namespace Drupal\content_translation\Tests;
+
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Test enabling content translation after other modules.
+ *
+ * @group content_translation
+ */
+class ContentTranslationEnableTest extends WebTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['entity_test', 'menu_link_content'];
+
+  /**
+   * Tests that entity schemas are up-to-date after enabling translation.
+   */
+  public function testEnable() {
+    $this->drupalLogin($this->rootUser);
+    // Enable modules and make sure the related config entity type definitions
+    // are installed.
+    $edit = [
+      'modules[Multilingual][content_translation][enable]' => TRUE,
+      'modules[Multilingual][language][enable]' => TRUE,
+    ];
+    $this->drupalPostForm('admin/modules', $edit, t('Install'));
+
+    // No pending updates should be available.
+    $this->drupalGet('admin/reports/status');
+    $requirement_value = $this->cssSelect("tr.system-status-report__entry th:contains('Entity/field definitions')");
+    $this->assertTrue(empty($requirement_value), 'There is no warning about Entity/field definitions');
+
+    // Enable content translation on entity types that have will have a
+    // content_translation_uid.
+    $edit = [
+      'entity_types[menu_link_content]' => TRUE,
+      'settings[menu_link_content][menu_link_content][translatable]' => TRUE,
+      'entity_types[entity_test_mul]' => TRUE,
+      'settings[entity_test_mul][entity_test_mul][translatable]' => TRUE,
+    ];
+    $this->drupalPostForm('admin/config/regional/content-language', $edit, t('Save configuration'));
+
+    // No pending updates should be available.
+    $this->drupalGet('admin/reports/status');
+    $requirement_value = $this->cssSelect("tr.system-status-report__entry th:contains('Entity/field definitions')");
+    $this->assertTrue(empty($requirement_value), 'There is no warning about Entity/field definitions');
+
+    // The above tests for the absence of a warning are extremely fragile.
+    // Rebuild the container because we've installed modules through the UI.
+    drupal_flush_all_caches();
+    $this->rebuildContainer();
+    $this->assertFalse(\Drupal::entityDefinitionUpdateManager()->needsUpdates(), 'Entity and field schema data are correctly detected.');
+  }
+
+}
diff --git a/core/modules/system/src/Tests/Entity/EntityDefinitionTestTrait.php b/core/modules/system/src/Tests/Entity/EntityDefinitionTestTrait.php
index a9f2b73..7d14aa3 100644
--- a/core/modules/system/src/Tests/Entity/EntityDefinitionTestTrait.php
+++ b/core/modules/system/src/Tests/Entity/EntityDefinitionTestTrait.php
@@ -105,6 +105,20 @@ protected function addBaseField($type = 'string') {
   }
 
   /**
+   * Adds a long-named base field to the 'entity_test_update' entity type.
+   */
+  protected function addLongNameBaseField() {
+    $key = 'entity_test_update.additional_base_field_definitions';
+    $definitions = $this->state->get($key, []);
+    $definitions['new_long_named_entity_reference_base_field'] = BaseFieldDefinition::create('entity_reference')
+      ->setName('new_long_named_entity_reference_base_field')
+      ->setLabel(t('A new long-named base field'))
+      ->setSetting('target_type', 'user')
+      ->setSetting('handler', 'default');
+    $this->state->set($key, $definitions);
+  }
+
+  /**
    * Adds a new revisionable base field to the 'entity_test_update' entity type.
    *
    * @param string $type
diff --git a/core/modules/system/src/Tests/Entity/EntityDefinitionUpdateTest.php b/core/modules/system/src/Tests/Entity/EntityDefinitionUpdateTest.php
index af9ccbc..a2a6b81 100644
--- a/core/modules/system/src/Tests/Entity/EntityDefinitionUpdateTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityDefinitionUpdateTest.php
@@ -18,6 +18,7 @@
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Field\FieldStorageDefinitionEvents;
 use Drupal\Core\Language\LanguageInterface;
+use Drupal\entity_test\Entity\EntityTestUpdate;
 
 /**
  * Tests EntityDefinitionUpdateManager functionality.
@@ -796,4 +797,17 @@ public function testBaseFieldEntityKeyUpdateWithExistingData() {
     }
   }
 
+  /**
+   * Check that field schema is are correctly handled with long-named fields.
+   */
+  function testLongNameFieldIndexes() {
+    $this->addLongNameBaseField();
+    $entity_type_id = 'entity_test_update';
+    $entity_type = $this->entityManager->getDefinition($entity_type_id);
+    $definitions = EntityTestUpdate::baseFieldDefinitions($entity_type);
+    $name = 'new_long_named_entity_reference_base_field';
+    $this->entityDefinitionUpdateManager->installFieldStorageDefinition($name, $entity_type_id, 'entity_test', $definitions[$name]);
+    $this->assertFalse($this->entityDefinitionUpdateManager->needsUpdates(), 'Entity and field schema data are correctly detected.');
+  }
+
 }
