diff --git a/core/modules/image/config/schema/image.schema.yml b/core/modules/image/config/schema/image.schema.yml
index 323220b..ad95a70 100644
--- a/core/modules/image/config/schema/image.schema.yml
+++ b/core/modules/image/config/schema/image.schema.yml
@@ -139,6 +139,14 @@ field.formatter.settings.image:
       type: string
       label: 'Image style'
 
+field.formatter.settings.image_url:
+  type: mapping
+  label: 'Image URL format settings'
+  mapping:
+    image_style:
+      type: string
+      label: 'Image style'
+
 field.widget.settings.image_image:
   type: mapping
   label: 'Image field display format settings'
diff --git a/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php b/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php
index 5f15073..d3d01c7 100644
--- a/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php
+++ b/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php
@@ -235,4 +235,17 @@ public function viewElements(FieldItemListInterface $items) {
     return $elements;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateDependencies() {
+    $dependencies = [];
+
+    if (!empty($image_style_setting) && $image_style = $this->imageStyleStorage->load($image_style_setting)) {
+      $dependencies['config'][] = $image_style->getConfigDependencyName();
+    }
+
+    return $dependencies;
+  }
+
 }
diff --git a/core/modules/image/src/Plugin/Field/FieldFormatter/ImageUrlFormatter.php b/core/modules/image/src/Plugin/Field/FieldFormatter/ImageUrlFormatter.php
new file mode 100644
index 0000000..1a633f8
--- /dev/null
+++ b/core/modules/image/src/Plugin/Field/FieldFormatter/ImageUrlFormatter.php
@@ -0,0 +1,123 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\image\Plugin\Field\FieldFormatter\ImageUrlFormatter.
+ */
+
+namespace Drupal\image\Plugin\Field\FieldFormatter;
+
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Url;
+
+/**
+ * Plugin implementation of the 'image_url' formatter.
+ *
+ * @FieldFormatter(
+ *   id = "image_url",
+ *   label = @Translation("URL to image"),
+ *   field_types = {
+ *     "image"
+ *   }
+ * )
+ */
+class ImageUrlFormatter extends ImageFormatter {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function defaultSettings() {
+    return [
+      'image_style' => '',
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function settingsForm(array $form, FormStateInterface $form_state) {
+    $image_styles = image_style_options(FALSE);
+    $element['image_style'] = [
+      '#title' => $this->t('Image style'),
+      '#type' => 'select',
+      '#default_value' => $this->getSetting('image_style'),
+      '#empty_option' => $this->t('None (original image)'),
+      '#options' => $image_styles,
+      '#description' => [
+        '#type' => 'link',
+        '#title' => $this->t('Configure Image Styles'),
+        '#url' => new Url('entity.image_style.collection'),
+        '#access' => $this->currentUser->hasPermission('administer image styles'),
+      ],
+    ];
+
+    return $element;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function settingsSummary() {
+    $summary = [];
+
+    $image_styles = image_style_options(FALSE);
+    // Unset possible 'No defined styles' option.
+    unset($image_styles['']);
+    // Styles could be lost because of enabled/disabled modules that defines
+    // their styles in code.
+    $image_style_setting = $this->getSetting('image_style');
+    if (isset($image_styles[$image_style_setting])) {
+      $summary[] = $this->t('Image style: @style', ['@style' => $image_styles[$image_style_setting]]);
+    }
+    else {
+      $summary[] = $this->t('Original image');
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function viewElements(FieldItemListInterface $items) {
+    $elements = [];
+    $images = $this->getEntitiesToView($items);
+
+    // Early opt-out if the field is empty.
+    if (empty($images)) {
+      return $elements;
+    }
+
+    $url = NULL;
+
+    $image_style_setting = $this->getSetting('image_style');
+
+    /** @var \Drupal\image\Entity\ImageStyle|false $image_style */
+    $image_style = FALSE;
+    if (!empty($image_style_setting)) {
+      $image_style = $this->imageStyleStorage->load($image_style_setting);
+    }
+
+    foreach ($images as $delta => $image) {
+      /** @var \Drupal\file\Entity\File $image */
+      $image_uri = $image->getFileUri();
+      $url = $image_style
+        ? $image_style->buildUrl($image_uri)
+        : file_create_url($image_uri);
+
+      // Collect cache tags to be added for each item in the field.
+      $cache_tags = $image_style
+        ? Cache::mergeTags($image_style->getCacheTags(), $image->getCacheTags())
+        : $image->getCacheTags();
+
+      $elements[$delta] = [
+        '#markup' => $url,
+        '#cache' => [
+          'tags' => $cache_tags,
+        ],
+      ];
+    }
+
+    return $elements;
+  }
+}
diff --git a/core/modules/image/src/Tests/ImageFieldDisplayTest.php b/core/modules/image/src/Tests/ImageFieldDisplayTest.php
index c4cf485..72d990e 100644
--- a/core/modules/image/src/Tests/ImageFieldDisplayTest.php
+++ b/core/modules/image/src/Tests/ImageFieldDisplayTest.php
@@ -202,6 +202,26 @@ function _testImageFieldFormatters($scheme) {
       $this->drupalGet(ImageStyle::load('thumbnail')->buildUrl($image_uri));
       $this->assertResponse('403', 'Access denied to image style thumbnail as anonymous user.');
     }
+
+    // Test the image URL formatter without an image style.
+    $display_options = [
+      'type' => 'image_url',
+      'settings' => [],
+    ];
+
+    $expected_url = file_create_url($image_uri);
+    $this->assertEqual($expected_url, $node->{$field_name}->view($display_options)[0]['#markup']);
+
+    // Test the image URL formatter with an image style.
+    $display_options = [
+      'type' => 'image_url',
+      'settings' => [
+        'image_style' => 'thumbnail',
+      ],
+    ];
+
+    $expected_url = ImageStyle::load('thumbnail')->buildUrl($image_uri);
+    $this->assertEqual($expected_url, $node->{$field_name}->view($display_options)[0]['#markup']);
   }
 
   /**
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index ce06b7a..653cb5a 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -1265,6 +1265,9 @@ function system_update_8004() {
   // ensure they match the currently expected status.
   $manager = \Drupal::entityDefinitionUpdateManager();
   foreach (array_keys(\Drupal::entityManager()->getDefinitions()) as $entity_type_id) {
+    if (is_null($manager->getEntityType($entity_type_id))) {
+      $manager->getEntityType($entity_type_id);
+    }
     $manager->updateEntityType($manager->getEntityType($entity_type_id));
   }
 }
