diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php
index 1328f65..4904b2d 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php
@@ -143,7 +143,7 @@ public function viewElements(FieldItemListInterface $items) {
         }
       }
       else {
-        // This is an "auto_create" item.
+        // This is an auto-created item.
         $elements[$delta] = array('#markup' => $entity->label());
       }
       $depth = 0;
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteWidget.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteWidget.php
index 0555fe1..030fca7 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteWidget.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteWidget.php
@@ -84,7 +84,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
       $element['auto_create_bundle'] = array(
         '#type' => 'checkbox',
         '#title' => $this->t("Create referenced entities if they don't already exist"),
-        '#default_value' => $this->getSetting('auto_create'),
+        '#default_value' => $this->getSetting('auto_create_bundle'),
         '#return_value' => $has_bundle ? key($bundles) : $entity_type->id(),
       );
     }
diff --git a/core/modules/entity_reference/src/Tests/EntityReferenceTestTrait.php b/core/modules/entity_reference/src/Tests/EntityReferenceTestTrait.php
index 1882079..4ab6df3 100644
--- a/core/modules/entity_reference/src/Tests/EntityReferenceTestTrait.php
+++ b/core/modules/entity_reference/src/Tests/EntityReferenceTestTrait.php
@@ -33,7 +33,7 @@
    *   The selection handler used by this field.
    * @param array $selection_handler_settings
    *   An array of settings supported by the selection handler specified above.
-   *   (e.g. 'target_bundles', 'sort', 'auto_create', etc).
+   *   (e.g. 'target_bundles', 'sort', etc).
    * @param int $cardinality
    *   The cardinality of the field.
    *
diff --git a/core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml b/core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml
index 6152f9e..752c6b6 100644
--- a/core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml
+++ b/core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml
@@ -141,9 +141,6 @@ migrate_entity_constant:
     selection_handler:
       type: string
       label: 'Entity reference selection handler'
-    auto_create:
-      type: boolean
-      label: 'Entity reference selection setting: Auto-create new entities'
     status:
       type: boolean
       label: 'Status'
diff --git a/core/modules/system/src/Tests/Field/Update/EntityReferenceSettingsUpdateTest.php b/core/modules/system/src/Tests/Field/Update/EntityReferenceSettingsUpdateTest.php
index f2ef355..10ebe21 100644
--- a/core/modules/system/src/Tests/Field/Update/EntityReferenceSettingsUpdateTest.php
+++ b/core/modules/system/src/Tests/Field/Update/EntityReferenceSettingsUpdateTest.php
@@ -43,8 +43,6 @@ protected function setDatabaseDumpFiles() {
    */
   public function setUp() {
     parent::setUp();
-
-    /** @var \Drupal\Core\Config\ConfigFactoryInterface $factory */
     $this->factory = $this->container->get('config.factory');
   }
 
@@ -122,9 +120,11 @@ protected function createUserReferenceField() {
         'translatable' => TRUE,
         'status' => TRUE,
         'langcode' => 'en',
+        'indexes' => [],
         'dependencies' => [
           'module' => ['node', 'entity_reference'],
         ],
+        'persist_with_no_fields' => FALSE,
       ])
       ->save(TRUE);
     $this->factory->getEditable("field.field.node.article.$name")
@@ -161,6 +161,12 @@ protected function createUserReferenceField() {
         ->set("content.$name.settings", [])
         ->save(TRUE);
 
+    /** @var \Drupal\Core\Entity\EntityDefinitionUpdateManagerInterface $entity_update_manager */
+    $entity_update_manager = $this->container->get('entity.definition_update_manager');
+    // Apply field storage updates.
+    $definition = FieldStorageConfig::loadByName('node', $name);
+    $entity_update_manager->installFieldStorageDefinition($name, 'node', 'node', $definition);
+
     return $name;
   }
 
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index 5089dc1..761b308 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -1270,7 +1270,8 @@ function system_update_8004() {
 }
 
 /**
- * Migrates the entity reference selection handler 'auto_create' setting to ield widget settings.
+ * Migrates the entity reference selection handler 'auto_create' setting to
+ * field widget settings.
  */
 function system_update_8005() {
   static $types = [];
@@ -1295,7 +1296,7 @@ function system_update_8005() {
       continue;
     }
 
-    // Get the field name.
+    // Get the entity type and field name.
     list(,, $entity_type,, $field_name) = explode('.', $field_id);
 
     // Try to load from static cache.