diff --git a/core/modules/media/config/schema/media.schema.yml b/core/modules/media/config/schema/media.schema.yml
index 14d40a9065..dad518985a 100644
--- a/core/modules/media/config/schema/media.schema.yml
+++ b/core/modules/media/config/schema/media.schema.yml
@@ -44,6 +44,14 @@ media.source.*:
   type: mapping
   label: 'Media source settings'
 
+media.source.file:
+  type: media.source.field_aware
+  label: '"File" media source configuration'
+
+media.source.image:
+  type: media.source.field_aware
+  label: '"Image" media source configuration'
+
 media.source.field_aware:
   type: mapping
   mapping:
diff --git a/core/modules/media/images/icons/no-thumbnail.png b/core/modules/media/images/icons/no-thumbnail.png
new file mode 100644
index 0000000000..496a18479e
--- /dev/null
+++ b/core/modules/media/images/icons/no-thumbnail.png
@@ -0,0 +1,4 @@
+‰PNG
+
+   IHDR   ´   ´    ¦Yî  ûIDATxíÛ‡Ã@Åñûþß pË`A
+\@R° À‚9@×£w²ÿ ˜å§^²ÛÙöãbX Aƒú¬4hÐ Aƒ4hÐ Aƒ4hÐ Aƒ4hÐ Aƒ:?ßV~u}ý<VþGô-ÞÖž^mS­Û9è˜›¾Í×WßP]Ðt<4 èÈtiZ'´Ä­ñ@k@,Ð´Ä ­=ÐÕ-IÕ-¹» 5 hˆZbÖ€x 5 hˆZâÖ€x 7ˆ:&ˆºt–€ Kº´µ: gY9õ®£,|ô]ÆÍÉàí±%Å—èýE÷½£ëýØ#Øºhœ—è½Jœ‡Ý£'éÏýêUÚ&Leî%úG‹9•0@³:–¶utLvŸ´\Ú^FtmÆÙ-ßWVt¬òÒ3@ËÁt¨&èh¦W´ŒFtìIÏèØÚ%Å-C´› cÔýÜíúÂç& &/ e?_LÐ±è~nw`2T—ÃuvAë~î€–‡q6AÇ*ç óóXµ;ãç÷ßüè›ÿ€4hÐ Aƒ4hÐ Aƒ4hÐ Aƒ4hÐ Aƒ4hÐ p]n!Á    IEND®B`‚
\ No newline at end of file
diff --git a/core/modules/media/src/Plugin/media/Source/File.php b/core/modules/media/src/Plugin/media/Source/File.php
new file mode 100644
index 0000000000..33bf4f68d3
--- /dev/null
+++ b/core/modules/media/src/Plugin/media/Source/File.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace Drupal\media\Plugin\media\Source;
+
+use Drupal\file\FileInterface;
+use Drupal\media\MediaInterface;
+use Drupal\media\MediaSourceBase;
+
+/**
+ * File entity media source.
+ *
+ * @see \Drupal\file\FileInterface
+ *
+ * @MediaSource(
+ *   id = "file",
+ *   label = @Translation("File"),
+ *   description = @Translation("Use local files for reusable media."),
+ *   allowed_field_types = {"file"},
+ *   default_thumbnail_filename = "generic.png"
+ * )
+ */
+class File extends MediaSourceBase {
+
+  /**
+   * Key for MIME type metadata attribute.
+   *
+   * @var string
+   */
+  const METADATA_ATTRIBUTE_MIME = 'mime';
+
+  /**
+   * Key for size metadata attribute.
+   *
+   * @var string
+   */
+  const METADATA_ATTRIBUTE_SIZE = 'size';
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getMetadataAttributes() {
+    return [
+      static::METADATA_ATTRIBUTE_MIME => $this->t('MIME type'),
+      static::METADATA_ATTRIBUTE_SIZE => $this->t('Size'),
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getMetadata(MediaInterface $media, $name) {
+    /** @var \Drupal\file\FileInterface $file */
+    $file = $media->get($this->configuration['source_field'])->entity;
+    // If the source field is not required, it may be empty.
+    if (!$file) {
+      return parent::getMetadata($media, $name);
+    }
+    switch ($name) {
+      case 'default_name':
+        return $file->getFilename();
+
+      case 'thumbnail_uri':
+        return $this->getThumbnail($file) ?: parent::getMetadata($media, $name);
+
+      case static::METADATA_ATTRIBUTE_MIME:
+        return $file->getMimeType() ?: NULL;
+
+      case static::METADATA_ATTRIBUTE_SIZE:
+        $size = $file->getSize();
+        return is_numeric($size) ? $size : NULL;
+
+      default:
+        return parent::getMetadata($media, $name);
+    }
+  }
+
+  /**
+   * Gets the thumbnail image URI based on a file entity.
+   *
+   * @param \Drupal\file\FileInterface $file
+   *   A file entity.
+   *
+   * @return string
+   *   File URI of the thumbnail image or NULL if there is no specific icon.
+   */
+  protected function getThumbnail(FileInterface $file) {
+    $icon_base = $this->configFactory->get('media.settings')->get('icon_base_uri');
+
+    // We try to automatically use the most specific icon present in the
+    // $icon_base directory, based on the MIME type. For instance, if an
+    // icon file named "pdf.png" is present, it will be used if the file
+    // matches this MIME type.
+    $mimetype = $file->getMimeType();
+    $mimetype = explode('/', $mimetype);
+
+    $icon_names = array(
+      $mimetype[0] . '--' . $mimetype[1],
+      $mimetype[1],
+      $mimetype[0],
+    );
+    foreach ($icon_names as $icon_name) {
+      $thumbnail = $icon_base . '/' . $icon_name . '.png';
+      if (is_file($thumbnail)) {
+        return $thumbnail;
+      }
+    }
+
+    return NULL;
+  }
+
+}
diff --git a/core/modules/media/src/Plugin/media/Source/Image.php b/core/modules/media/src/Plugin/media/Source/Image.php
new file mode 100644
index 0000000000..706e180f8a
--- /dev/null
+++ b/core/modules/media/src/Plugin/media/Source/Image.php
@@ -0,0 +1,248 @@
+<?php
+
+namespace Drupal\media\Plugin\media\Source;
+
+use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Datetime\DrupalDateTime;
+use Drupal\Core\Entity\EntityFieldManagerInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Field\FieldTypePluginManagerInterface;
+use Drupal\Core\File\FileSystem;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Image\ImageFactory;
+use Drupal\media\MediaInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Image entity media source.
+ *
+ * @see \Drupal\Core\Image\ImageInterface
+ *
+ * @MediaSource(
+ *   id = "image",
+ *   label = @Translation("Image"),
+ *   description = @Translation("Use local images for reusable media."),
+ *   allowed_field_types = {"image"},
+ *   default_thumbnail_filename = "no-thumbnail.png"
+ * )
+ */
+class Image extends File {
+
+  /**
+   * Key for width metadata attribute.
+   *
+   * @var int
+   */
+  const METADATA_ATTRIBUTE_WIDTH = 'width';
+
+  /**
+   * Key for height metadata attribute.
+   *
+   * @var int
+   */
+  const METADATA_ATTRIBUTE_HEIGHT = 'height';
+
+  /**
+   * The image factory service.
+   *
+   * @var \Drupal\Core\Image\ImageFactory
+   */
+  protected $imageFactory;
+
+  /**
+   * File system service.
+   *
+   * @var \Drupal\Core\File\FileSystem
+   */
+  protected $fileSystem;
+
+  /**
+   * The EXIF data.
+   *
+   * @var array
+   */
+  protected $exif;
+
+  /**
+   * Constructs a new class instance.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin_id for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   Entity type manager service.
+   * @param \Drupal\Core\Entity\EntityFieldManagerInterface $entity_field_manager
+   *   Entity field manager service.
+   * @param \Drupal\Core\Field\FieldTypePluginManagerInterface $field_type_manager
+   *   The field type plugin manager service.
+   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
+   *   The config factory service.
+   * @param \Drupal\Core\Image\ImageFactory $image_factory
+   *   The image factory.
+   * @param \Drupal\Core\File\FileSystem $file_system
+   *   File system service.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, EntityFieldManagerInterface $entity_field_manager, FieldTypePluginManagerInterface $field_type_manager, ConfigFactoryInterface $config_factory, ImageFactory $image_factory, FileSystem $file_system) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition, $entity_type_manager, $entity_field_manager, $field_type_manager, $config_factory);
+
+    $this->imageFactory = $image_factory;
+    $this->fileSystem = $file_system;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('entity_type.manager'),
+      $container->get('entity_field.manager'),
+      $container->get('plugin.manager.field.field_type'),
+      $container->get('config.factory'),
+      $container->get('image.factory'),
+      $container->get('file_system')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getMetadataAttributes() {
+    $attributes = parent::getMetadataAttributes();
+
+    $attributes += [
+      static::METADATA_ATTRIBUTE_WIDTH => $this->t('Width'),
+      static::METADATA_ATTRIBUTE_HEIGHT => $this->t('Height'),
+    ];
+
+    if ($this->canReadExifData()) {
+      $attributes += [
+        'model' => $this->t('Camera model'),
+        'created' => $this->t('Image creation datetime'),
+        'iso' => $this->t('ISO'),
+        'exposure' => $this->t('Exposure time'),
+        'aperture' => $this->t('Aperture value'),
+        'focal_length' => $this->t('Focal length'),
+      ];
+    }
+
+    return $attributes;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getMetadata(MediaInterface $media, $name) {
+    // Get the file, image and EXIF data.
+    /** @var \Drupal\file\FileInterface $file */
+    $file = $media->get($this->configuration['source_field'])->entity;
+    // If the source field is not required, it may be empty.
+    if (!$file) {
+      return parent::getMetadata($media, $name);
+    }
+
+    $uri = $file->getFileUri();
+    $image = $this->imageFactory->get($uri);
+    switch ($name) {
+      case static::METADATA_ATTRIBUTE_WIDTH:
+        return $image->getWidth() ?: NULL;
+
+      case static::METADATA_ATTRIBUTE_HEIGHT:
+        return $image->getHeight() ?: NULL;
+
+      case 'thumbnail_uri':
+        return $uri;
+    }
+
+    if ($this->canReadExifData()) {
+      switch ($name) {
+        case 'created':
+          /** @var \DateTime $date */
+          $date = new DrupalDateTime($this->getExifField($uri, 'DateTimeOriginal'));
+          return $date->getTimestamp();
+
+        case 'model':
+          return $this->getExifField($uri, 'Model');
+
+        case 'iso':
+          return $this->getExifField($uri, 'ISOSpeedRatings');
+
+        case 'exposure':
+          return $this->getExifField($uri, 'ExposureTime');
+
+        case 'aperture':
+          return $this->getExifField($uri, 'FNumber');
+
+        case 'focal_length':
+          return $this->getExifField($uri, 'FocalLength');
+      }
+    }
+
+    return parent::getMetadata($media, $name);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
+    $form = parent::buildConfigurationForm($form, $form_state);
+
+    if (!$this->canReadExifData()) {
+      $form['no_exif_data_reader'] = [
+        '#markup' => $this->t('Unable to read EXIF data for images. In order to provide EXIF data reading functionality please take a look at PHP documentation of the <a href="https://secure.php.net/exif_read_data" target="_blank">exif_read_data</a> function.'),
+      ];
+    }
+
+    return $form;
+  }
+
+  /**
+   * Checks if we can read EXIF data.
+   *
+   * @return bool
+   *   Returns TRUE if functionality for reading of EXIF data is provided.
+   */
+  protected function canReadExifData() {
+    return function_exists('exif_read_data');
+  }
+
+  /**
+   * Gets EXIF field value.
+   *
+   * @param string $uri
+   *   The URI for the file that we are getting the EXIF for.
+   * @param string $field
+   *   The name of the requested EXIF field.
+   *
+   * @return string|bool
+   *   The value for the requested field or FALSE if it is not set.
+   */
+  protected function getExifField($uri, $field) {
+    if (empty($this->exif)) {
+      $this->exif = $this->getExifData($uri);
+    }
+
+    return $this->exif[$field] ?: NULL;
+  }
+
+  /**
+   * Reads EXIF.
+   *
+   * @param string $uri
+   *   The URI for the file that we are getting the EXIF field value.
+   *
+   * @return array|bool
+   *   An associative array where the keys are header names and values are
+   *   the values associated with those headers. We return FALSE if the data
+   *   can't be read.
+   */
+  protected function getExifData($uri) {
+    return exif_read_data($this->fileSystem->realpath($uri), 'EXIF');
+  }
+
+}
diff --git a/core/modules/media/tests/fixtures/exif_example_1.jpeg b/core/modules/media/tests/fixtures/exif_example_1.jpeg
new file mode 100644
index 0000000000..ac79b36804
--- /dev/null
+++ b/core/modules/media/tests/fixtures/exif_example_1.jpeg
@@ -0,0 +1,50 @@
+ÿØÿà JFIF  H H  ÿá Exif  MM *           b       x       €(              ‡i       ˆˆ%       ²    Drupal EXIF Camera 1     H      H         0210      0100     ÿÿ            N           è     E                  4           `—  ó              Æ  ÆÿáÍhttp://ns.adobe.com/xap/1.0/ <?xpacket begin='ï»¿' id='W5M0MpCehiHzreSzNTczkc9d'?>
+<x:xmpmeta xmlns:x='adobe:ns:meta/'>
+<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
+
+ <rdf:Description xmlns:exif='http://ns.adobe.com/exif/1.0/'>
+  <exif:Model>Drupal EXIF Camera</exif:Model>
+  <exif:XResolution>72</exif:XResolution>
+  <exif:YResolution>72</exif:YResolution>
+  <exif:ResolutionUnit>Inch</exif:ResolutionUnit>
+  <exif:YCbCrPositioning>Centered</exif:YCbCrPositioning>
+  <exif:ExifVersion>Exif Version 2.1</exif:ExifVersion>
+  <exif:FlashPixVersion>FlashPix Version 1.0</exif:FlashPixVersion>
+  <exif:ColorSpace>Uncalibrated</exif:ColorSpace>
+  <exif:InteroperabilityIndex>N</exif:InteroperabilityIndex>
+  <exif:InteroperabilityVersion>52, 30, 32.751</exif:InteroperabilityVersion>
+  <exif:GPSLongitudeRef>E</exif:GPSLongitudeRef>
+  <exif:GPSLongitude>13, 22, 25.5432</exif:GPSLongitude>
+ </rdf:Description>
+
+</rdf:RDF>
+</x:xmpmeta>
+<?xpacket end='r'?>
+ÿÛ C 
+
+
+ÿÛ C		ÿÂ  Y È ÿÄ             ÿÄ            ÿÚ    õH N«žÁ´       ‰ùÅéÆ‹Ù`:Q&ÜY­Œ       9nZþüÆlê(-§Ïpûã“Ÿ{“'¸·h´à     ß\¸Râ@o3uv‡'ƒßÛËô‹N¦ô     ¾‡%Wiñú}c ÇïÊ­±0ÿ E‡ØÓÃ-©%•–óª»À   +»Œý[}˜ˆ[Ð  Òå/ÂO¯°¿I„^fdp,ëüÄ††§^_¿?³ê}:ÎžQ]gYh2óZ‹ÝÞ]ëËÌÕ‹E¦€Þgøý£D­hfôú¯)¶åÉ‹Kê±0Ùq,LîªGdþ²æuœ•ÖÛV·Ù­N¼®¬–Ú#kOŸŸHÎ¾Wþ+èT×çÏ×¡±_Dó¶Ûç;|ät!Îª´ø¯Nüûêrˆvb=Þ%qkMtQé#}£vøw€]ç¡v”’Hxzy³súl_¾i-v·tvÂ¯¥\Ž–ç.Ð«j]Î]º$ØÔ:o,o>maÓ_Øô×ð[
+È”êü¼JàØYÔ·Òî   +ì½ŸC¨  !’ày³W‹áK?«ºÚüõ­ûùÜ‹2ÿ Îj¶      Uæ½²ªŒË…½Ë¤òºÖQÂX               ÿÄ '           6@03PÿÚ  öH}júÎr5fKlÓ\m‹5óŒqŠ…ôìYìq´ûŽÐhc¥²ºi8Çº7çµýç}¶ÙF¬à¯zÉÉetÏöc4
+B/¡»¾îô¶¥ŸÞ,’Œ(‹âšÊ©Ô%àURÒþ:š•´sZªíºy<™Ù–À. ~Œ¼ÉŸÕR`¢ú=ÊÓ^Ó%#Ï?™»1ZÓwF’Ðhš?;3Z•#.Kéõ£ý¼Ö“Ö8#æú¿‘s;œq—WB»/å(]i€CºIø=ôÑã*@/.ß&{¨£'ñýÌé)MtZQ5ÙXnæ5Pø©ð›‡¤¦µJ‹£‰‘Úí·fKÊ»s®ó}í%e®g"d!?‚„i¬®qIp÷‹„ÃkÅ¯h¤UÃè¡ˆ>=ðÛÖ„ºNý6º:·©Ç~£óÆJ)anjZÓYp{³YgP“MšR‹\Qéø;5v‘ÑÀ¯A©*>2”mÇ ûY­”C þèÊ[¨~(ÖSHlÆ"ðüÎÙµ¢¡kÖ¦ü%r²-ïÐç ?@öÃMÁ i ¸¨«Ÿ¦7™ÜD–œÆ$lúSCˆî`†Yt4ñt7¬ˆ7:<Jÿ —ÿÄ = 	       !1AQ"#2aq± @‘Áð05¡Ñ$34BPRcáÿÚ ?õ(4øi{°÷ûAQPèýxUÖF•Ð€0	¨7¢ÐÈÖ8ÓZ34¬}‘JËãAëU\.ŽŒ¶–²âŠ•ÈÛ‹iYÐp5n»ú§õ+ÏØœXm%j¡!´':Žº›yÇ Í-jpæQ×êl«\Ã!¼‹ía¿I)JYNýt·œs¶¬}xNógR®KŒþbrã~Ñ«óÿ •ìÌµdØ¯¼fé¥—Íro:ñáW¥f˜¡Ã]¤QäŽ¬ì¥]Õö‡°ß¾­M¡P‘˜qó5v`D’Ö¬uûêåq}¥6YVIu?r—(þèQÀcF|´ÂÒt³á°p«[ÎHŒtâjï:DgÂVîú¸ÜD$ 5¨Ð›sXÒ'<5yU²èd«B÷k¹\ù§VÞµyW=ºeÒëÃÃW•[.|ó«sR‡çPÿ >*ùÕé8LW~–Ûišs«R7+C(lyÔ‹LWö')î©–÷¡ž–´ñ¤5½UÔ·zNêL·4†JÚÔEEX@î¯´=†ýõhþI¿™«êÂ¤%p«Â4Ji³¹"¡¶–£ $n«êqŠãúÕ‘@ÄÃ5|PT°à*êAœBö)rŒ»)Ü‚ëÕìÌ>XÔ¬='×lÌ>‘JSs=™Â¡þ,|Uó«û—Ç‡%µ!	áË!æšG\uTgàz	À÷ýjä34SÇWÆ€À`*ñéI@dc…"Õ	Ñ§<GëPìÊCši'õ¶®ð”êTÊqwS))m)<)ö!²ÒöUº|E8wiwK§•ãããWQÀƒÝä)ÈwÇDÑ%;°?XU²ÒXV™þÖáWKY—ÖµÚó¦áÜœê	!>:ª5²Còôâ6Th2¸iÔžŽ'†üiöS!²Úö‘qÜ(5mŸÍ‘¡{fêô”Oóó©}Ìy¬ÃM)Y‰Ü>tàŒëJS]ÜjÈ hßøÓKÓõƒ³»õû©v•È“§
+á÷¢"RpVÚ‘ØçŽFbµ!±•ÌÀÑ´Éî®fÛ_ÆsÜf¡Û	9ßÙÂ¶{CNÛ#¹¯<+Ð¨ÜºE™¡ÚQ4ÌVXì'ûgÿÄ : 	       !"1A#2Qq 0@a¡45R‘±Ááð$3PcÑÿÚ ?õQDq}ã(Oz°æ4Û*<UR° áÎÎÃN°ãÎ{ Më=¶&¡ASÊº©)GBÐ—UŠ›†–»F¸{’RV¬¢‹(åeEÃ-¼å%!ÉõqºÌŽÜp†Š>T–ÐŽèõå7®Ú“Ñ
+[$^Ö¯Bÿ ³åûÔœ9ØÃ?íÃ´ãuŒÞ:ÂÅ£]jåÐúrº¡ñ¬¼ºÄ¤ÊUòÕ†ºd0RæÞU.%aÑr©˜˜Ô‘:ã™z`nå¿Î±Ãå•†ÄeöJœMÍê#)D“dŠ1` ä6¿OÃƒU®Yß_vº¬éì¿ŸïSàumôwjOÕßrJÃâ§¢táeNÕ\É7+4Î#!žw‹5¹Cw…)~'K{­í5{ªt%Îu$ÝåyÖÞ]b_J_ó•a)`¨ó5†¯Q.,sQ©*.<¢¯Â¤øV,’$ßÄV2Ç¹ñ¬;è—O´¬×ÞãMæ8iöM1~¡Ùñ±è	¿ÆÂ¤ý]÷'ô¬îóGÏ¢rŠ¤®ý,´ãªìªC3t÷•qÐÆÇ¼6þMÍëÔu(ºmK•‡(çVÓåR±0´i0,+–Ë”¸«m§RÉÓªaaÄr¡6”_LÄ[ÓÒXq´0|é¹0_Ý *§â!äé5Â OêÝ›ßÊ—&;P>Tüö]ŠS›x=1…ÂÒ
+Þ°ý)—TÊÃ‰åLÈKÈ>ºµZã]BOÙü©œ/›Æ®åô£§(ÿ å$ÈmÀ—7©˜~sŸÂœFˆÉÏŸ²ˆ¡†4Š}„i*Œ«ŽÌ–ßAèvKŒ9¼‹§á^’bºÓŽiyáR± Ft¹â)¼Eôs½zU\ÓGp÷@§d:÷|ÿ ŒÿÄ C 			       !1"AQaq2B‘ #@¡±ÁÑá0RSTbrs‚²$3P’“£ÂðÿÚ  ?ð36S(ê¬2ïÚ­wTÓÍäõ&€kÝkwõŠ~¼rÇ^P‰t7a–@$×2a,L¤ÌËŒˆ:i÷Åež#4d¡æòD¤Ç—Ôlkß¸o‹É“|ºÔ#°Žnóè‚ÛfÒÎB–³U+™+BŠœB’hD&Z}^0à‡ò
+Ü|‰Ç×ÕN­»rÓë]5nà ·/—¢
+ÖJ”uŸroªÔÃ=UÖ‡ËJ$Ð|¯PöÇŒqJÜO†ÄØ®‚ê 5§XîæeA›ëÂ{T¤c"?»ð‹šÔ•ø”ýŸÑ¬é­–öWU7Dçå§ôÈæZUršô‰?¼¯dJÚm*­¬ÇÚ0Û’Âè( OeUÕª•vé·˜K”²pG&´êYNjCv‰÷Eúž)™WD”
+ÒÍi”!ç×xáQÆ”×n]ë´‚©dja! 90çU'!¼Åúêoç!T	Y /û+¯ŒXS*Ç$éŸº¥mÜèú ²ð™H®(Aüw½J‰Þ)ý˜¸á-Ë Ð‘šŽÁS&×¦Ñï0hÐaÍJkFQã¶NN§/„Q0*–däŽÚ½Ðëòh-8È´E¢B†¸äýì…wãy^È“üß¨ÃM'†ñâbA“›r©GtK!´Ñ6„2xÜD 3C„JSŠ’ÒRxÔŸl).“v› ð¤$"–)…œ©	¸¥Ž’Œ¶á_Ma]&—wéµ\©‡2n)w~ ›9S?Ž÷©Q/6ŠÓtxŒG·»šL#"‹^sÎzjÐV¿6¸ñå¼œ+»Ni†Ó×x\§Š´G®Ú€K&Y«Ò‚k¤®ËwŒ´2á‡¦Ôû¡ÕƒjÀ5©ÚL4¹f/P¡6€Æ§i†R¬” Gš—th,S„(JÞžÛ¥xÀ›å(«vj¥ðâND zyg_v_°[^¯d	©º_£c<c¤KÑ3 P¤öþ0%T·šcªm¹¢!ÀÉèÈtÑÂ´õvçmlR^õÅ[´œi®–^²WÍ:Œ9/0‹ ÐÓ(³AWC¨âEiéŸãWº
+9=¢Ò»ì™îX™\ìÃø¢]¥ãO´up‡Ý”Jä¦Y¢®Ü] ±Za[”Tl'¨õ*xLÒR¤Ê7üB…jÈ«†¡Äîù#8—Ð”’6|€´n¦ÔtAÝsMYØ±ŠUÀó"æ},ò…tš vSþ1“'}äZåPmJú¼¦šÎíÐ—ùA*eŒÃ'¬®; % %# ¯#-º„¸ƒšV*Zl9-¹µ`{ãC”l§b™¯ûGŽœy†}ñj^Y)sé’»ÏòÏÿÄ )       !1AQaq‘¡ð @±ÁÑ0ñPÿÚ  ?!ú	…åÐG}KFë6ûef¸U‚”"P!/ƒž!i84WM;"äj¶žf­›e±6³¾
+~–òUûãí/2]á¶$žFTñ€…xdÜÔœ]~Jòpjf‚WÑD±‰ŠsáÈÒ<#³‡~ÆtaÃ)`9T;Ô{‰î³b$c»•¡#¸(ûk.4ú’”™Ç-œîØ/&Yû$±Mæ_{hðàxúìfÖ·y4 —”l`/;Ö¥t¬„—Ÿ'èê f8ÝÉÊ¥%A<ï?^ø9ôSm¨ù+ç6¥¿´£fŒ(½€.Ìn¯Æ“¹´P 8MÚËGÈ³BÅÃ•DI,Vb—û†”æçòœ"Œ¡ú(p'‚%ÄÓVÝ5Î^ô
+jñQtÛ¾˜æ„mÊwFÏ
+`1‹ò2 ít4àÔº¢ÎßÉâ¤rÈ5ü;¸ü×6ïW÷~ì:ßŠH•a^©Â·üP¿¢Õ|æÔöÔˆðš"ÇˆóWUEÕ% ÂŒRUå«+ŸñýÅ)Vm%qhè: FÒ%-¤öÅ"qº™2Êž"&ˆÒ¤@ç¦â= ŠKçº’>‚¼»êÎbÁžà«e+ãÑ@Yþ'ðLž¸Ž)LÀx™È¥Ã2éÒ ýG,¬ßO}* ‡i¤Eè_à1Ó e+DèÞ›Û>3¤&~f´6MLÊë~k8ÊéTÌ@œ"Š³À¸„µ[ôÿ ‚Ÿ@½-É¥Ø1›‘¡YÜ¸Ñ±TÁûåbh»SJfbmû4}X.N•,~¹”M³ŠJÍ6%ñBV‹¾(ò]àwþ#@ßÍÎòIÔ“æä`Q%Þµ5ÎÊb9 »—K‘Ü1"l×ø
+@3‘Á­% ¬|ÌÛ<zDFB‹¾®6ì*>mžåZB`yzIµû”}S†ýg¿J=â 0Ù‹—z£Éõ—Ø,vŠ4ïæ	g…÷¥Ä]ìI£ÿ 3ÿÚ      ’G$’I$’I$’rµ’I$’I$’*³îI$’I$’)Sl‰$’I$’DÛmï%òI$’L›m»æ×Ú%5¤Šs¹ÚÄo{‚BjNdûéú„r¦˜ŸrI$É$‘¿„–I$’I$’A–ÒI$’I$’I$’I$’I$’OÿÄ *       !1AQaq‘¡±Áð@Ñ 0áPñÿÚ ?þÉ˜âDvÜÏã¨Ò;ý]çqV~6ÝXUënô¡“®þýj©ÔÏâX+Ü¯ÌŠyvÐí¿-öŒR¦•ëþnù^š)_KJt‹AÓô}ÿ 	x±÷Ö–\.ñÆ„î´A¹Îžzöƒ­)”¿€ªJ6’%÷7ë¿à¦ÐÜí[ö£a-¼¿šIØèæ³JUÚf"#‡z´‚ElŽü!Äÿ bµˆãHÖ7§C@ôŸŸç+¡§‡9jõ¾Â u@ÐÄ-ÓlUšÐBÊî:SYËqÎÄ¢ë$_	ñ5*o‡€*Oabäj;P¢Ã€Ýø-7½ª]=áý@†DÑÖÖv58˜¤ßž]ï1]·37ÑÐM°76MNæ±÷{Uè^ñà‘pÊì|½-µŠœ‚óe¢×³Ó”óVÚLwÙáì´ëèPOÕú:ßhcC9Q5Î±¶u6{W­ö;2”õU({Òå†òR œAî’½V˜F
+ù£å¸f®&‰ë+ì”Í`ö}Ú #aˆÒ8Úˆ—¼û“A3pœaÄDñPDUÚ‰In#WÝíUb[/säðÃBíßWÅ"Ñ¼ñýšÎ´ñwÙñáäü4Eˆ©´“7ÆéF”{k¤¨˜I%—tæ÷\ºT],‹Êê›Ð;¨V+-ž£zikí$ÆËJ!±eYž|Ë­,Æ†šºÐé=Úu¡ñCã•Äí33„ÂB6‹ï¥ô‚H¨,,Íƒ›‘h-Ú‡×8neLãŠYlÎ™ÔÒëøö¬±ž¦‰V†Ü‹¤è›k9ãkSìý*qûÍ—Ê€,»ñºÓ€Ç˜LVL‚bÎçÙÈm,c.Î½êP5kúEŽ¬éýIÎb3`>?£Oò°1¢aðŠ­[´kŽ½
+»ÔûÖ8ã¹DŠ4jzþ¨?@ÈïKA>_”ÉsÈ¤çÊÝ`!ß/›ÿ 3ÿÄ *        !1AQaq‘¡±ÁÑð@á 0ñPÿÚ ?þ
+×n™„ä_oÇ±B5éó§xcRNRúZÁÊôÑ$ÉÁá¥O/‡'ñ/ÖÁ‹÷=i¤à×7Ÿ±Îq¢…÷ü:ÚˆD"Lš%¿œÌù<~ìv°^Xß}eýeCÛúóÂ†ðÆÍuîŽŸ‚@ÌYÏÞjú'óÕÃŽ^„Ö)Ç™HÊ…â3Ó.'ûý™ƒe³9Êt¡yš½ãÛùÀCÐÉy®Ü÷©®0ÁÙKÄ…S˜™ëŠTÀNR˜F‰Rµ<˜“¿mîÂ³›&gNU ¾›Ôy„b–ƒDÖ³P5Ð÷ÓB1¡»ÌÓ4Þ9Nc™–¦ù]:1_^FÙVÄ¦tÍÊ­RU¯ˆé¹£Éßíz4SºûúÀ5}¯IãB
+pµÝñïUÈƒŠÇ–¦ýb„µx¶GÏéÓ’Ì°¢yª»sÞ¼o
+´1c€õž”Xa¥šYvlr£Å‡Qù¤Y<{S­IÂÈÐ@7Kœ¡à¤›+¯8Îs½48³4†;E0]+Y¼Æó†õyš]­3ŒÙ¾óXkÐ¡WÁáöôlÊÇ"ÇoP€dÌ´sÊ…†±ñ½‰ïèç°ùÔˆ±jøE—]™À›åêRÕ¡Ú ÃlêFX- Ðke^õŽbÿ Ne©Âd&81p¡,â$ R‰îhFdIŸ¾ÙÓl~.°iÆï“7ÙúÃîu1ˆ$\½,îÖHÅi&#½^CˆÊñ9Ö+?QX0¿b’RìG=Íþñ½*a9CÝøëJ³bÑiÙŸõ}	D„#}¾ñU+¸àæ|TóeäËn9¼·þ¡.Rol×çú1b±5ýÖ28ž$ÉnMgéÅ¡É—¥E¼¾üšt’çáJ¬¸þ°Ð0¹îEÙëú¬)u~+SL‡üÏÿÄ &       !1AQaq @‘¡±0PÁÿÚ  ?ú;ŒÐY«(­µ>Þ*TÊ¯” $ìs pF•Ä-¶‹¶JªJª¥$á4ØÌ » òZÖ`ZiHÅûM|ìAÁŽ¶ÃDyõÊb¯0[ ²ŽÝfÆ)Û¿G]W&ñ·ØìcÓ^g©ÉXTRW@£ H¶D)ÙQ˜ìiÏ Ï‘…Pò1
+0FTµvÍ3ú^‰·1ì*¶øðx4} À!áÎme™KT¡´U£ìniK	ÇGŠQê²&6LÒ÷è¾~¥]-dòÀ(%áŽqS!Ôr”ûU^µöq„tžQþñvëP9@ák¹þhKKwìð½fD5¥ j;½×ë{©Þê«MåGçÐu¡„üë¦ðèCƒ… hV@1¢îQµÞ†»a¢¡‚ˆ€Ø#6»r^~‡FFËçöÇ’hñ†¼ýbE;ÁK5—?YcÒB2è¨ìŽG&îÆƒ»gWÉùgÔˆÒùÄàPlR´ÒÖ<Çußÿ Îq„Ž‚M‚–·iªz,jˆQæ­ý¾„çñªˆ„K(YÖÎÅû‚{XtÇ‰²1Sòh½Îqèª»Â<Ç«Ìar.Éßã¾iRÔ¤P#WaÓ€ŽC³Þ!ÙPÀÄMŽ9Ù+à?GÔró£²Šüíøbh/FŠ?Ù‰Ê0ÞìŠ¯w,àTq~GäËgr”?ß¿lê#_“ùÎ¼‘¤7ò}Ü i$ÔÂÌàkÉì?8N…‘ZÍë¾t¸¦˜é^wm„Ôž–4G!¬îÞt=ž„¶Ñ×Üö“§¬Æõ ’"ƒ¨]Ã"¥ï0t¶JÈ–¡èÇöìŒÜ
+#¦cÓƒà”3úPõ+.Xœ•ù)tÚºï›€‚EÁ´.à×§!ƒBo7¥ÚM13¦`ó€)½b9p4’è€ƒÂ ¬\æçò-¸2È*¢ [Vu+û”vI†˜ ½ì%X¹·úH‰4Ê€¶ª`\t“ñàp.’
+ âûjv•Þ!aðTS¥v4›oŒE <cÂ·ul]Íâ‘l X
+u(éqƒÓÔŽ‚”I±8ãF‘GaëJK"H¼Þÿ · èi{ê*={‹ÈÆ­ŒÑnº‚43
+·ã1€ëdŸ ÕÄÚôƒà@:á‹
+… fÆ‰I°ÿ  ®ó{f·Ÿð¤¬eßÎåØ•Í»ü­ÌPœ‹ècr\ÊPV‚¼ŽôVD/EïÐþ±…¾ÂFÐx˜%Xº{aÓÆ&žõª—º*   ãìàjÌnÂD÷0X:œ¥ë$tñŠ‰mFÁýasÄœ?ÞC¨Ð‹Ô“ÛùŸÿÙ
\ No newline at end of file
diff --git a/core/modules/media/tests/fixtures/exif_example_2.jpeg b/core/modules/media/tests/fixtures/exif_example_2.jpeg
new file mode 100644
index 0000000000..0cbd028f76
--- /dev/null
+++ b/core/modules/media/tests/fixtures/exif_example_2.jpeg
@@ -0,0 +1,50 @@
+ÿØÿà JFIF  H H  ÿá Exif  MM *           b       x       €(              ‡i       ˆˆ%       ²    Drupal EXIF Camera 2     H      H         0210      0100     ÿÿ            N           è     E                  4           `—  ó              Æ  ÆÿáÍhttp://ns.adobe.com/xap/1.0/ <?xpacket begin='ï»¿' id='W5M0MpCehiHzreSzNTczkc9d'?>
+<x:xmpmeta xmlns:x='adobe:ns:meta/'>
+<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
+
+ <rdf:Description xmlns:exif='http://ns.adobe.com/exif/1.0/'>
+  <exif:Model>Drupal EXIF Camera</exif:Model>
+  <exif:XResolution>72</exif:XResolution>
+  <exif:YResolution>72</exif:YResolution>
+  <exif:ResolutionUnit>Inch</exif:ResolutionUnit>
+  <exif:YCbCrPositioning>Centered</exif:YCbCrPositioning>
+  <exif:ExifVersion>Exif Version 2.1</exif:ExifVersion>
+  <exif:FlashPixVersion>FlashPix Version 1.0</exif:FlashPixVersion>
+  <exif:ColorSpace>Uncalibrated</exif:ColorSpace>
+  <exif:InteroperabilityIndex>N</exif:InteroperabilityIndex>
+  <exif:InteroperabilityVersion>52, 30, 32.751</exif:InteroperabilityVersion>
+  <exif:GPSLongitudeRef>E</exif:GPSLongitudeRef>
+  <exif:GPSLongitude>13, 22, 25.5432</exif:GPSLongitude>
+ </rdf:Description>
+
+</rdf:RDF>
+</x:xmpmeta>
+<?xpacket end='r'?>
+ÿÛ C 
+
+
+ÿÛ C		ÿÂ  Y È ÿÄ             ÿÄ            ÿÚ    õH N«žÁ´       ‰ùÅéÆ‹Ù`:Q&ÜY­Œ       9nZþüÆlê(-§Ïpûã“Ÿ{“'¸·h´à     ß\¸Râ@o3uv‡'ƒßÛËô‹N¦ô     ¾‡%Wiñú}c ÇïÊ­±0ÿ E‡ØÓÃ-©%•–óª»À   +»Œý[}˜ˆ[Ð  Òå/ÂO¯°¿I„^fdp,ëüÄ††§^_¿?³ê}:ÎžQ]gYh2óZ‹ÝÞ]ëËÌÕ‹E¦€Þgøý£D­hfôú¯)¶åÉ‹Kê±0Ùq,LîªGdþ²æuœ•ÖÛV·Ù­N¼®¬–Ú#kOŸŸHÎ¾Wþ+èT×çÏ×¡±_Dó¶Ûç;|ät!Îª´ø¯Nüûêrˆvb=Þ%qkMtQé#}£vøw€]ç¡v”’Hxzy³súl_¾i-v·tvÂ¯¥\Ž–ç.Ð«j]Î]º$ØÔ:o,o>maÓ_Øô×ð[
+È”êü¼JàØYÔ·Òî   +ì½ŸC¨  !’ày³W‹áK?«ºÚüõ­ûùÜ‹2ÿ Îj¶      Uæ½²ªŒË…½Ë¤òºÖQÂX               ÿÄ '           6@03PÿÚ  öH}júÎr5fKlÓ\m‹5óŒqŠ…ôìYìq´ûŽÐhc¥²ºi8Çº7çµýç}¶ÙF¬à¯zÉÉetÏöc4
+B/¡»¾îô¶¥ŸÞ,’Œ(‹âšÊ©Ô%àURÒþ:š•´sZªíºy<™Ù–À. ~Œ¼ÉŸÕR`¢ú=ÊÓ^Ó%#Ï?™»1ZÓwF’Ðhš?;3Z•#.Kéõ£ý¼Ö“Ö8#æú¿‘s;œq—WB»/å(]i€CºIø=ôÑã*@/.ß&{¨£'ñýÌé)MtZQ5ÙXnæ5Pø©ð›‡¤¦µJ‹£‰‘Úí·fKÊ»s®ó}í%e®g"d!?‚„i¬®qIp÷‹„ÃkÅ¯h¤UÃè¡ˆ>=ðÛÖ„ºNý6º:·©Ç~£óÆJ)anjZÓYp{³YgP“MšR‹\Qéø;5v‘ÑÀ¯A©*>2”mÇ ûY­”C þèÊ[¨~(ÖSHlÆ"ðüÎÙµ¢¡kÖ¦ü%r²-ïÐç ?@öÃMÁ i ¸¨«Ÿ¦7™ÜD–œÆ$lúSCˆî`†Yt4ñt7¬ˆ7:<Jÿ —ÿÄ = 	       !1AQ"#2aq± @‘Áð05¡Ñ$34BPRcáÿÚ ?õ(4øi{°÷ûAQPèýxUÖF•Ð€0	¨7¢ÐÈÖ8ÓZ34¬}‘JËãAëU\.ŽŒ¶–²âŠ•ÈÛ‹iYÐp5n»ú§õ+ÏØœXm%j¡!´':Žº›yÇ Í-jpæQ×êl«\Ã!¼‹ía¿I)JYNýt·œs¶¬}xNógR®KŒþbrã~Ñ«óÿ •ìÌµdØ¯¼fé¥—Íro:ñáW¥f˜¡Ã]¤QäŽ¬ì¥]Õö‡°ß¾­M¡P‘˜qó5v`D’Ö¬uûêåq}¥6YVIu?r—(þèQÀcF|´ÂÒt³á°p«[ÎHŒtâjï:DgÂVîú¸ÜD$ 5¨Ð›sXÒ'<5yU²èd«B÷k¹\ù§VÞµyW=ºeÒëÃÃW•[.|ó«sR‡çPÿ >*ùÕé8LW~–Ûišs«R7+C(lyÔ‹LWö')î©–÷¡ž–´ñ¤5½UÔ·zNêL·4†JÚÔEEX@î¯´=†ýõhþI¿™«êÂ¤%p«Â4Ji³¹"¡¶–£ $n«êqŠãúÕ‘@ÄÃ5|PT°à*êAœBö)rŒ»)Ü‚ëÕìÌ>XÔ¬='×lÌ>‘JSs=™Â¡þ,|Uó«û—Ç‡%µ!	áË!æšG\uTgàz	À÷ýjä34SÇWÆ€À`*ñéI@dc…"Õ	Ñ§<GëPìÊCši'õ¶®ð”êTÊqwS))m)<)ö!²ÒöUº|E8wiwK§•ãããWQÀƒÝä)ÈwÇDÑ%;°?XU²ÒXV™þÖáWKY—ÖµÚó¦áÜœê	!>:ª5²Còôâ6Th2¸iÔžŽ'†üiöS!²Úö‘qÜ(5mŸÍ‘¡{fêô”Oóó©}Ìy¬ÃM)Y‰Ü>tàŒëJS]ÜjÈ hßøÓKÓõƒ³»õû©v•È“§
+á÷¢"RpVÚ‘ØçŽFbµ!±•ÌÀÑ´Éî®fÛ_ÆsÜf¡Û	9ßÙÂ¶{CNÛ#¹¯<+Ð¨ÜºE™¡ÚQ4ÌVXì'ûgÿÄ : 	       !"1A#2Qq 0@a¡45R‘±Ááð$3PcÑÿÚ ?õQDq}ã(Oz°æ4Û*<UR° áÎÎÃN°ãÎ{ Më=¶&¡ASÊº©)GBÐ—UŠ›†–»F¸{’RV¬¢‹(åeEÃ-¼å%!ÉõqºÌŽÜp†Š>T–ÐŽèõå7®Ú“Ñ
+[$^Ö¯Bÿ ³åûÔœ9ØÃ?íÃ´ãuŒÞ:ÂÅ£]jåÐúrº¡ñ¬¼ºÄ¤ÊUòÕ†ºd0RæÞU.%aÑr©˜˜Ô‘:ã™z`nå¿Î±Ãå•†ÄeöJœMÍê#)D“dŠ1` ä6¿OÃƒU®Yß_vº¬éì¿ŸïSàumôwjOÕßrJÃâ§¢táeNÕ\É7+4Î#!žw‹5¹Cw…)~'K{­í5{ªt%Îu$ÝåyÖÞ]b_J_ó•a)`¨ó5†¯Q.,sQ©*.<¢¯Â¤øV,’$ßÄV2Ç¹ñ¬;è—O´¬×ÞãMæ8iöM1~¡Ùñ±è	¿ÆÂ¤ý]÷'ô¬îóGÏ¢rŠ¤®ý,´ãªìªC3t÷•qÐÆÇ¼6þMÍëÔu(ºmK•‡(çVÓåR±0´i0,+–Ë”¸«m§RÉÓªaaÄr¡6”_LÄ[ÓÒXq´0|é¹0_Ý *§â!äé5Â OêÝ›ßÊ—&;P>Tüö]ŠS›x=1…ÂÒ
+Þ°ý)—TÊÃ‰åLÈKÈ>ºµZã]BOÙü©œ/›Æ®åô£§(ÿ å$ÈmÀ—7©˜~sŸÂœFˆÉÏŸ²ˆ¡†4Š}„i*Œ«ŽÌ–ßAèvKŒ9¼‹§á^’bºÓŽiyáR± Ft¹â)¼Eôs½zU\ÓGp÷@§d:÷|ÿ ŒÿÄ C 			       !1"AQaq2B‘ #@¡±ÁÑá0RSTbrs‚²$3P’“£ÂðÿÚ  ?ð36S(ê¬2ïÚ­wTÓÍäõ&€kÝkwõŠ~¼rÇ^P‰t7a–@$×2a,L¤ÌËŒˆ:i÷Åež#4d¡æòD¤Ç—Ôlkß¸o‹É“|ºÔ#°Žnóè‚ÛfÒÎB–³U+™+BŠœB’hD&Z}^0à‡ò
+Ü|‰Ç×ÕN­»rÓë]5nà ·/—¢
+ÖJ”uŸroªÔÃ=UÖ‡ËJ$Ð|¯PöÇŒqJÜO†ÄØ®‚ê 5§XîæeA›ëÂ{T¤c"?»ð‹šÔ•ø”ýŸÑ¬é­–öWU7Dçå§ôÈæZUršô‰?¼¯dJÚm*­¬ÇÚ0Û’Âè( OeUÕª•vé·˜K”²pG&´êYNjCv‰÷Eúž)™WD”
+ÒÍi”!ç×xáQÆ”×n]ë´‚©dja! 90çU'!¼Åúêoç!T	Y /û+¯ŒXS*Ç$éŸº¥mÜèú ²ð™H®(Aüw½J‰Þ)ý˜¸á-Ë Ð‘šŽÁS&×¦Ñï0hÐaÍJkFQã¶NN§/„Q0*–däŽÚ½Ðëòh-8È´E¢B†¸äýì…wãy^È“üß¨ÃM'†ñâbA“›r©GtK!´Ñ6„2xÜD 3C„JSŠ’ÒRxÔŸl).“v› ð¤$"–)…œ©	¸¥Ž’Œ¶á_Ma]&—wéµ\©‡2n)w~ ›9S?Ž÷©Q/6ŠÓtxŒG·»šL#"‹^sÎzjÐV¿6¸ñå¼œ+»Ni†Ó×x\§Š´G®Ú€K&Y«Ò‚k¤®ËwŒ´2á‡¦Ôû¡ÕƒjÀ5©ÚL4¹f/P¡6€Æ§i†R¬” Gš—th,S„(JÞžÛ¥xÀ›å(«vj¥ðâND zyg_v_°[^¯d	©º_£c<c¤KÑ3 P¤öþ0%T·šcªm¹¢!ÀÉèÈtÑÂ´õvçmlR^õÅ[´œi®–^²WÍ:Œ9/0‹ ÐÓ(³AWC¨âEiéŸãWº
+9=¢Ò»ì™îX™\ìÃø¢]¥ãO´up‡Ý”Jä¦Y¢®Ü] ±Za[”Tl'¨õ*xLÒR¤Ê7üB…jÈ«†¡Äîù#8—Ð”’6|€´n¦ÔtAÝsMYØ±ŠUÀó"æ},ò…tš vSþ1“'}äZåPmJú¼¦šÎíÐ—ùA*eŒÃ'¬®; % %# ¯#-º„¸ƒšV*Zl9-¹µ`{ãC”l§b™¯ûGŽœy†}ñj^Y)sé’»ÏòÏÿÄ )       !1AQaq‘¡ð @±ÁÑ0ñPÿÚ  ?!ú	…åÐG}KFë6ûef¸U‚”"P!/ƒž!i84WM;"äj¶žf­›e±6³¾
+~–òUûãí/2]á¶$žFTñ€…xdÜÔœ]~Jòpjf‚WÑD±‰ŠsáÈÒ<#³‡~ÆtaÃ)`9T;Ô{‰î³b$c»•¡#¸(ûk.4ú’”™Ç-œîØ/&Yû$±Mæ_{hðàxúìfÖ·y4 —”l`/;Ö¥t¬„—Ÿ'èê f8ÝÉÊ¥%A<ï?^ø9ôSm¨ù+ç6¥¿´£fŒ(½€.Ìn¯Æ“¹´P 8MÚËGÈ³BÅÃ•DI,Vb—û†”æçòœ"Œ¡ú(p'‚%ÄÓVÝ5Î^ô
+jñQtÛ¾˜æ„mÊwFÏ
+`1‹ò2 ít4àÔº¢ÎßÉâ¤rÈ5ü;¸ü×6ïW÷~ì:ßŠH•a^©Â·üP¿¢Õ|æÔöÔˆðš"ÇˆóWUEÕ% ÂŒRUå«+ŸñýÅ)Vm%qhè: FÒ%-¤öÅ"qº™2Êž"&ˆÒ¤@ç¦â= ŠKçº’>‚¼»êÎbÁžà«e+ãÑ@Yþ'ðLž¸Ž)LÀx™È¥Ã2éÒ ýG,¬ßO}* ‡i¤Eè_à1Ó e+DèÞ›Û>3¤&~f´6MLÊë~k8ÊéTÌ@œ"Š³À¸„µ[ôÿ ‚Ÿ@½-É¥Ø1›‘¡YÜ¸Ñ±TÁûåbh»SJfbmû4}X.N•,~¹”M³ŠJÍ6%ñBV‹¾(ò]àwþ#@ßÍÎòIÔ“æä`Q%Þµ5ÎÊb9 »—K‘Ü1"l×ø
+@3‘Á­% ¬|ÌÛ<zDFB‹¾®6ì*>mžåZB`yzIµû”}S†ýg¿J=â 0Ù‹—z£Éõ—Ø,vŠ4ïæ	g…÷¥Ä]ìI£ÿ 3ÿÚ      ’G$’I$’I$’rµ’I$’I$’*³îI$’I$’)Sl‰$’I$’DÛmï%òI$’L›m»æ×Ú%5¤Šs¹ÚÄo{‚BjNdûéú„r¦˜ŸrI$É$‘¿„–I$’I$’A–ÒI$’I$’I$’I$’I$’OÿÄ *       !1AQaq‘¡±Áð@Ñ 0áPñÿÚ ?þÉ˜âDvÜÏã¨Ò;ý]çqV~6ÝXUënô¡“®þýj©ÔÏâX+Ü¯ÌŠyvÐí¿-öŒR¦•ëþnù^š)_KJt‹AÓô}ÿ 	x±÷Ö–\.ñÆ„î´A¹Îžzöƒ­)”¿€ªJ6’%÷7ë¿à¦ÐÜí[ö£a-¼¿šIØèæ³JUÚf"#‡z´‚ElŽü!Äÿ bµˆãHÖ7§C@ôŸŸç+¡§‡9jõ¾Â u@ÐÄ-ÓlUšÐBÊî:SYËqÎÄ¢ë$_	ñ5*o‡€*Oabäj;P¢Ã€Ýø-7½ª]=áý@†DÑÖÖv58˜¤ßž]ï1]·37ÑÐM°76MNæ±÷{Uè^ñà‘pÊì|½-µŠœ‚óe¢×³Ó”óVÚLwÙáì´ëèPOÕú:ßhcC9Q5Î±¶u6{W­ö;2”õU({Òå†òR œAî’½V˜F
+ù£å¸f®&‰ë+ì”Í`ö}Ú #aˆÒ8Úˆ—¼û“A3pœaÄDñPDUÚ‰In#WÝíUb[/säðÃBíßWÅ"Ñ¼ñýšÎ´ñwÙñáäü4Eˆ©´“7ÆéF”{k¤¨˜I%—tæ÷\ºT],‹Êê›Ð;¨V+-ž£zikí$ÆËJ!±eYž|Ë­,Æ†šºÐé=Úu¡ñCã•Äí33„ÂB6‹ï¥ô‚H¨,,Íƒ›‘h-Ú‡×8neLãŠYlÎ™ÔÒëøö¬±ž¦‰V†Ü‹¤è›k9ãkSìý*qûÍ—Ê€,»ñºÓ€Ç˜LVL‚bÎçÙÈm,c.Î½êP5kúEŽ¬éýIÎb3`>?£Oò°1¢aðŠ­[´kŽ½
+»ÔûÖ8ã¹DŠ4jzþ¨?@ÈïKA>_”ÉsÈ¤çÊÝ`!ß/›ÿ 3ÿÄ *        !1AQaq‘¡±ÁÑð@á 0ñPÿÚ ?þ
+×n™„ä_oÇ±B5éó§xcRNRúZÁÊôÑ$ÉÁá¥O/‡'ñ/ÖÁ‹÷=i¤à×7Ÿ±Îq¢…÷ü:ÚˆD"Lš%¿œÌù<~ìv°^Xß}eýeCÛúóÂ†ðÆÍuîŽŸ‚@ÌYÏÞjú'óÕÃŽ^„Ö)Ç™HÊ…â3Ó.'ûý™ƒe³9Êt¡yš½ãÛùÀCÐÉy®Ü÷©®0ÁÙKÄ…S˜™ëŠTÀNR˜F‰Rµ<˜“¿mîÂ³›&gNU ¾›Ôy„b–ƒDÖ³P5Ð÷ÓB1¡»ÌÓ4Þ9Nc™–¦ù]:1_^FÙVÄ¦tÍÊ­RU¯ˆé¹£Éßíz4SºûúÀ5}¯IãB
+pµÝñïUÈƒŠÇ–¦ýb„µx¶GÏéÓ’Ì°¢yª»sÞ¼o
+´1c€õž”Xa¥šYvlr£Å‡Qù¤Y<{S­IÂÈÐ@7Kœ¡à¤›+¯8Îs½48³4†;E0]+Y¼Æó†õyš]­3ŒÙ¾óXkÐ¡WÁáöôlÊÇ"ÇoP€dÌ´sÊ…†±ñ½‰ïèç°ùÔˆ±jøE—]™À›åêRÕ¡Ú ÃlêFX- Ðke^õŽbÿ Ne©Âd&81p¡,â$ R‰îhFdIŸ¾ÙÓl~.°iÆï“7ÙúÃîu1ˆ$\½,îÖHÅi&#½^CˆÊñ9Ö+?QX0¿b’RìG=Íþñ½*a9CÝøëJ³bÑiÙŸõ}	D„#}¾ñU+¸àæ|TóeäËn9¼·þ¡.Rol×çú1b±5ýÖ28ž$ÉnMgéÅ¡É—¥E¼¾üšt’çáJ¬¸þ°Ð0¹îEÙëú¬)u~+SL‡üÏÿÄ &       !1AQaq @‘¡±0PÁÿÚ  ?ú;ŒÐY«(­µ>Þ*TÊ¯” $ìs pF•Ä-¶‹¶JªJª¥$á4ØÌ » òZÖ`ZiHÅûM|ìAÁŽ¶ÃDyõÊb¯0[ ²ŽÝfÆ)Û¿G]W&ñ·ØìcÓ^g©ÉXTRW@£ H¶D)ÙQ˜ìiÏ Ï‘…Pò1
+0FTµvÍ3ú^‰·1ì*¶øðx4} À!áÎme™KT¡´U£ìniK	ÇGŠQê²&6LÒ÷è¾~¥]-dòÀ(%áŽqS!Ôr”ûU^µöq„tžQþñvëP9@ák¹þhKKwìð½fD5¥ j;½×ë{©Þê«MåGçÐu¡„üë¦ðèCƒ… hV@1¢îQµÞ†»a¢¡‚ˆ€Ø#6»r^~‡FFËçöÇ’hñ†¼ýbE;ÁK5—?YcÒB2è¨ìŽG&îÆƒ»gWÉùgÔˆÒùÄàPlR´ÒÖ<Çußÿ Îq„Ž‚M‚–·iªz,jˆQæ­ý¾„çñªˆ„K(YÖÎÅû‚{XtÇ‰²1Sòh½Îqèª»Â<Ç«Ìar.Éßã¾iRÔ¤P#WaÓ€ŽC³Þ!ÙPÀÄMŽ9Ù+à?GÔró£²Šüíøbh/FŠ?Ù‰Ê0ÞìŠ¯w,àTq~GäËgr”?ß¿lê#_“ùÎ¼‘¤7ò}Ü i$ÔÂÌàkÉì?8N…‘ZÍë¾t¸¦˜é^wm„Ôž–4G!¬îÞt=ž„¶Ñ×Üö“§¬Æõ ’"ƒ¨]Ã"¥ï0t¶JÈ–¡èÇöìŒÜ
+#¦cÓƒà”3úPõ+.Xœ•ù)tÚºï›€‚EÁ´.à×§!ƒBo7¥ÚM13¦`ó€)½b9p4’è€ƒÂ ¬\æçò-¸2È*¢ [Vu+û”vI†˜ ½ì%X¹·úH‰4Ê€¶ª`\t“ñàp.’
+ âûjv•Þ!aðTS¥v4›oŒE <cÂ·ul]Íâ‘l X
+u(éqƒÓÔŽ‚”I±8ãF‘GaëJK"H¼Þÿ · èi{ê*={‹ÈÆ­ŒÑnº‚43
+·ã1€ëdŸ ÕÄÚôƒà@:á‹
+… fÆ‰I°ÿ  ®ó{f·Ÿð¤¬eßÎåØ•Í»ü­ÌPœ‹ècr\ÊPV‚¼ŽôVD/EïÐþ±…¾ÂFÐx˜%Xº{aÓÆ&žõª—º*   ãìàjÌnÂD÷0X:œ¥ë$tñŠ‰mFÁýasÄœ?ÞC¨Ð‹Ô“ÛùŸÿÙ
\ No newline at end of file
diff --git a/core/modules/media/tests/src/FunctionalJavascript/MediaSourceFileTest.php b/core/modules/media/tests/src/FunctionalJavascript/MediaSourceFileTest.php
new file mode 100644
index 0000000000..a2883ed522
--- /dev/null
+++ b/core/modules/media/tests/src/FunctionalJavascript/MediaSourceFileTest.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace Drupal\Tests\media\FunctionalJavascript;
+
+use Drupal\media\Entity\Media;
+use Drupal\media\Plugin\media\Source\File;
+
+/**
+ * Tests the file media source.
+ *
+ * @group media
+ */
+class MediaSourceFileTest extends MediaSourceTestBase {
+
+  /**
+   * Tests the file media source.
+   */
+  public function testMediaFileSource() {
+    $media_type_id = 'test_media_file_type';
+    $source_field_id = 'field_media_file';
+    $provided_fields = [
+      File::METADATA_ATTRIBUTE_MIME,
+      File::METADATA_ATTRIBUTE_SIZE,
+    ];
+
+    $session = $this->getSession();
+    $page = $session->getPage();
+    $assert_session = $this->assertSession();
+
+    $this->doTestCreateMediaType($media_type_id, 'file', $provided_fields);
+
+    // Create a custom field for the media type to store the MIME metadata
+    // attributes.
+    $fields = [
+      'field_string_mime' => 'string',
+      'field_string_size' => 'string',
+    ];
+    $this->createMediaTypeFields($fields, $media_type_id);
+
+    // Hide the name field widget to test default name generation.
+    $this->hideMediaTypeFieldWidget('name', $media_type_id);
+
+    $this->drupalGet("admin/structure/media/manage/{$media_type_id}");
+    $page->selectFieldOption("field_map[mime]", 'field_string_mime');
+    $page->selectFieldOption("field_map[size]", 'field_string_size');
+    $page->pressButton('Save');
+
+    // Create a media item.
+    $this->drupalGet("media/add/{$media_type_id}");
+    $page->attachFileToField("files[{$source_field_id}_0]", \Drupal::root() . '/sites/README.txt');
+    $assert_session->assertWaitOnAjaxRequest();
+    $page->pressButton('Save and publish');
+
+    $assert_session->addressEquals('media/1');
+
+    // Make sure the thumbnail is displayed.
+    $assert_session->elementAttributeContains('css', '.image-style-thumbnail', 'src', 'generic.png');
+
+    // Load the media and check that all fields are properly populated.
+    $media = Media::load(1);
+    $this->assertEquals('README.txt', $media->label());
+    $this->assertEquals('text/plain', $media->get('field_string_mime')->value);
+    $this->assertEquals(filesize(\Drupal::root() . '/sites/README.txt'), $media->get('field_string_size')->value);
+
+    // Test the MIME type icon.
+    $icon_base = \Drupal::config('media.settings')->get('icon_base_uri');
+    file_unmanaged_copy($icon_base . '/generic.png', $icon_base . '/text--plain.png');
+    $this->drupalGet("media/add/{$media_type_id}");
+    $page->attachFileToField("files[{$source_field_id}_0]", \Drupal::root() . '/sites/README.txt');
+    $assert_session->assertWaitOnAjaxRequest();
+    $page->pressButton('Save and publish');
+    $assert_session->elementAttributeContains('css', '.image-style-thumbnail', 'src', 'text--plain.png');
+  }
+
+}
diff --git a/core/modules/media/tests/src/FunctionalJavascript/MediaSourceImageTest.php b/core/modules/media/tests/src/FunctionalJavascript/MediaSourceImageTest.php
new file mode 100644
index 0000000000..bfe1f83964
--- /dev/null
+++ b/core/modules/media/tests/src/FunctionalJavascript/MediaSourceImageTest.php
@@ -0,0 +1,94 @@
+<?php
+
+namespace Drupal\Tests\media\FunctionalJavascript;
+
+use Drupal\media\Entity\Media;
+
+/**
+ * Tests the image media source.
+ *
+ * @package Drupal\Tests\media\FunctionalJavascript
+ *
+ * @group media
+ */
+class MediaSourceImageTest extends MediaSourceTestBase {
+
+  /**
+   * Tests the image media source.
+   */
+  public function testMediaImageSource() {
+    $media_type_id = 'test_media_image_type';
+    $source_field_id = 'field_media_image';
+    $provided_fields = [
+      'mime',
+      'width',
+      'height',
+      'size',
+      'created',
+      'model',
+      'iso',
+      'exposure',
+      'aperture',
+      'focal_length',
+    ];
+
+    $session = $this->getSession();
+    $page = $session->getPage();
+    $assert_session = $this->assertSession();
+
+    $this->doTestCreateMediaType($media_type_id, 'image', $provided_fields);
+
+    // Create custom fields for the media type to store metadata attributes.
+    $fields = [
+      'field_string_mime' => 'string',
+      'field_string_size' => 'string',
+      'field_string_width' => 'string',
+      'field_string_model' => 'string',
+    ];
+    $this->createMediaTypeFields($fields, $media_type_id);
+
+    // Hide the name field widget to test default name generation.
+    $this->hideMediaTypeFieldWidget('name', $media_type_id);
+
+    $this->drupalGet("admin/structure/media/manage/{$media_type_id}");
+    $page->selectFieldOption("field_map[mime]", 'field_string_mime');
+    $page->selectFieldOption("field_map[size]", 'field_string_size');
+    $page->selectFieldOption("field_map[width]", 'field_string_width');
+    $page->selectFieldOption("field_map[model]", 'field_string_model');
+    $page->pressButton('Save');
+
+    // Create a media item.
+    $this->drupalGet("media/add/{$media_type_id}");
+    $page->attachFileToField("files[{$source_field_id}_0]", \Drupal::root() . '/core/modules/media/tests/fixtures/exif_example_1.jpeg');
+    $assert_session->assertWaitOnAjaxRequest();
+    $page->fillField("{$source_field_id}[0][alt]", 'EXIF Image Alt Text 1');
+    $page->pressButton('Save and publish');
+
+    $assert_session->addressEquals('media/1');
+
+    // Make sure the thumbnail is displayed from uploaded image.
+    $assert_session->elementAttributeContains('css', '.image-style-thumbnail', 'src', 'exif_example_1.jpeg');
+
+    // Load the media and check that all fields are properly populated.
+    $media = Media::load(1);
+    $this->assertEquals('exif_example_1.jpeg', $media->label());
+    $this->assertEquals('Drupal EXIF Camera 1', $media->get('field_string_model')->value);
+    $this->assertEquals('200', $media->get('field_string_width')->value);
+    $this->assertEquals('image/jpeg', $media->get('field_string_mime')->value);
+    $this->assertEquals(filesize(\Drupal::root() . '/core/modules/media/tests/fixtures/exif_example_1.jpeg'), $media->get('field_string_size')->value);
+
+
+    // Create a second media item.
+    $this->drupalGet("media/add/{$media_type_id}");
+    $page->attachFileToField("files[{$source_field_id}_0]", \Drupal::root() . '/core/modules/media/tests/fixtures/exif_example_2.jpeg');
+    $assert_session->assertWaitOnAjaxRequest();
+    $page->fillField("{$source_field_id}[0][alt]", 'EXIF Image Alt Text 2');
+    $page->pressButton('Save and publish');
+
+    // Load second media and ensure that statically cached EXIF data not reused.
+    $media_2 = Media::load(2);
+    $this->assertEquals('Drupal EXIF Camera 1', $media->get('field_string_model')->value);
+    $this->assertEquals('Drupal EXIF Camera 2', $media_2->get('field_string_model')->value);
+  }
+
+}
diff --git a/core/modules/media/tests/src/FunctionalJavascript/MediaSourceTestBase.php b/core/modules/media/tests/src/FunctionalJavascript/MediaSourceTestBase.php
new file mode 100644
index 0000000000..0225824ee4
--- /dev/null
+++ b/core/modules/media/tests/src/FunctionalJavascript/MediaSourceTestBase.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace Drupal\Tests\media\FunctionalJavascript;
+
+use Drupal\Core\Entity\Entity\EntityFormDisplay;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\media\Entity\MediaType;
+
+/**
+ * Base class for media source tests.
+ */
+abstract class MediaSourceTestBase extends MediaJavascriptTestBase {
+
+  /**
+   * Creates storage and field instance, attached to a given media type.
+   *
+   * @param string $field_name
+   *   The field name.
+   * @param string $field_type
+   *   The field type.
+   * @param string $media_type_id
+   *   The media type config entity ID.
+   */
+  protected function createMediaTypeField($field_name, $field_type, $media_type_id) {
+    $storage = FieldStorageConfig::create([
+      'field_name' => $field_name,
+      'entity_type' => 'media',
+      'type' => $field_type,
+    ]);
+    $storage->save();
+
+    FieldConfig::create([
+      'field_storage' => $storage,
+      'bundle' => $media_type_id,
+    ])->save();
+
+    // Make the field widget visible in the form display.
+    $component = \Drupal::service('plugin.manager.field.widget')
+      ->prepareConfiguration($field_type, []);
+    /** @var \Drupal\Core\Entity\Display\EntityFormDisplayInterface $entity_form_display */
+    $entity_form_display = entity_get_form_display('media', $media_type_id, 'default');
+    $entity_form_display->setComponent($field_name, $component)
+      ->save();
+  }
+
+  /**
+   * Create a set of fields in a media type.
+   *
+   * @param array $fields
+   *   An associative array where keys are field names and values field types.
+   * @param string $media_type_id
+   *   The media type config entity ID.
+   */
+  protected function createMediaTypeFields(array $fields, $media_type_id) {
+    foreach ($fields as $field_name => $field_type) {
+      $this->createMediaTypeField($field_name, $field_type, $media_type_id);
+    }
+  }
+
+  /**
+   * Hides a widget in the default form display config.
+   *
+   * @param string $field_name
+   *   The field name.
+   * @param string $media_type_id
+   *   The media type config entity ID.
+   */
+  protected function hideMediaTypeFieldWidget($field_name, $media_type_id) {
+    /** @var \Drupal\Core\Entity\Display\EntityFormDisplayInterface $entity_form_display */
+    $entity_form_display = entity_get_form_display('media', $media_type_id, 'default');
+    if ($entity_form_display->getComponent($field_name)) {
+      $entity_form_display->removeComponent($field_name)->save();
+    }
+  }
+
+  /**
+   * Test generic media type creation.
+   *
+   * @param string $media_type_id
+   *   The media type config entity ID.
+   * @param string $source_id
+   *   The media source ID.
+   * @param array $provided_fields
+   *   (optional) An array of field machine names this type provides.
+   *
+   * @return \Drupal\media\MediaTypeInterface
+   *   The created media type.
+   */
+  public function doTestCreateMediaType($media_type_id, $source_id, array $provided_fields = []) {
+    $session = $this->getSession();
+    $page = $session->getPage();
+    $assert_session = $this->assertSession();
+
+    $this->drupalGet('admin/structure/media/add');
+    $page->fillField('label', $media_type_id);
+    $this->getSession()
+      ->wait(5000, "jQuery('.machine-name-value').text() === '{$media_type_id}'");
+
+    // Make sure the source is available.
+    $assert_session->fieldExists('Media source');
+    $assert_session->optionExists('Media source', $source_id);
+    $page->selectFieldOption('Media source', $source_id);
+    $assert_session->assertWaitOnAjaxRequest();
+
+    // Make sure the provided fields are visible on the form.
+    foreach ($provided_fields as $provided_field) {
+      $assert_session->selectExists("field_map[{$provided_field}]");
+    }
+
+    // Save the form to create the type.
+    $page->pressButton('Save');
+    $assert_session->statusCodeEquals(200);
+    $assert_session->pageTextContains('The media type ' . $media_type_id . ' has been added.');
+    $this->drupalGet('admin/structure/media');
+    $assert_session->pageTextContains($media_type_id);
+
+    // Bundle definitions are statically cached in the context of the test, we
+    // need to make sure we have updated information before proceeding with the
+    // actions on the UI.
+    \Drupal::service('entity_type.bundle.info')->clearCachedBundles();
+
+    return MediaType::load($media_type_id);
+  }
+
+}
diff --git a/core/profiles/standard/config/optional/core.entity_form_display.media.file.default.yml b/core/profiles/standard/config/optional/core.entity_form_display.media.file.default.yml
new file mode 100644
index 0000000000..15de2acd90
--- /dev/null
+++ b/core/profiles/standard/config/optional/core.entity_form_display.media.file.default.yml
@@ -0,0 +1,44 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.media.file.field_media_file
+    - media.type.file
+  module:
+    - file
+id: media.file.default
+targetEntityType: media
+bundle: file
+mode: default
+content:
+  created:
+    type: datetime_timestamp
+    weight: 10
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_media_file:
+    settings:
+      progress_indicator: throbber
+    third_party_settings: {  }
+    type: file_generic
+    weight: 26
+    region: content
+  name:
+    type: string_textfield
+    weight: -5
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  uid:
+    type: entity_reference_autocomplete
+    weight: 5
+    settings:
+      match_operator: CONTAINS
+      size: 60
+      placeholder: ''
+    region: content
+    third_party_settings: {  }
+hidden: {  }
diff --git a/core/profiles/standard/config/optional/core.entity_form_display.media.image.default.yml b/core/profiles/standard/config/optional/core.entity_form_display.media.image.default.yml
new file mode 100644
index 0000000000..a040f31b83
--- /dev/null
+++ b/core/profiles/standard/config/optional/core.entity_form_display.media.image.default.yml
@@ -0,0 +1,46 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.media.image.field_media_image
+    - image.style.thumbnail
+    - media.type.image
+  module:
+    - image
+id: media.image.default
+targetEntityType: media
+bundle: image
+mode: default
+content:
+  created:
+    type: datetime_timestamp
+    weight: 10
+    region: content
+    settings: { }
+    third_party_settings: { }
+  field_media_image:
+    settings:
+      progress_indicator: throbber
+      preview_image_style: thumbnail
+    third_party_settings: { }
+    type: image_image
+    weight: 26
+    region: content
+  name:
+    type: string_textfield
+    weight: -5
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: { }
+  uid:
+    type: entity_reference_autocomplete
+    weight: 5
+    settings:
+      match_operator: CONTAINS
+      size: 60
+      placeholder: ''
+    region: content
+    third_party_settings: { }
+hidden: { }
diff --git a/core/profiles/standard/config/optional/core.entity_view_display.media.file.default.yml b/core/profiles/standard/config/optional/core.entity_view_display.media.file.default.yml
new file mode 100644
index 0000000000..697f117c6e
--- /dev/null
+++ b/core/profiles/standard/config/optional/core.entity_view_display.media.file.default.yml
@@ -0,0 +1,50 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.media.file.field_media_file
+    - image.style.thumbnail
+    - media.type.file
+  module:
+    - file
+    - image
+    - user
+id: media.file.default
+targetEntityType: media
+bundle: file
+mode: default
+content:
+  created:
+    label: hidden
+    type: timestamp
+    weight: 0
+    region: content
+    settings:
+      date_format: medium
+      custom_date_format: ''
+      timezone: ''
+    third_party_settings: {  }
+  field_media_file:
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    type: file_default
+    weight: 6
+    region: content
+  thumbnail:
+    type: image
+    weight: 5
+    label: hidden
+    settings:
+      image_style: thumbnail
+      image_link: ''
+    region: content
+    third_party_settings: {  }
+  uid:
+    label: hidden
+    type: author
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+hidden: {  }
diff --git a/core/profiles/standard/config/optional/core.entity_view_display.media.image.default.yml b/core/profiles/standard/config/optional/core.entity_view_display.media.image.default.yml
new file mode 100644
index 0000000000..e541d7f784
--- /dev/null
+++ b/core/profiles/standard/config/optional/core.entity_view_display.media.image.default.yml
@@ -0,0 +1,51 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.media.image.field_media_image
+    - image.style.thumbnail
+    - media.type.image
+  module:
+    - image
+    - user
+id: media.image.default
+targetEntityType: media
+bundle: image
+mode: default
+content:
+  created:
+    label: hidden
+    type: timestamp
+    weight: 0
+    region: content
+    settings:
+      date_format: medium
+      custom_date_format: ''
+      timezone: ''
+    third_party_settings: {  }
+  field_media_image:
+    label: above
+    settings:
+      image_style: ''
+      image_link: ''
+    third_party_settings: {  }
+    type: image
+    weight: 6
+    region: content
+  thumbnail:
+    type: image
+    weight: 5
+    label: hidden
+    settings:
+      image_style: thumbnail
+      image_link: ''
+    region: content
+    third_party_settings: {  }
+  uid:
+    label: hidden
+    type: author
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+hidden: {  }
diff --git a/core/profiles/standard/config/optional/field.field.media.file.field_media_file.yml b/core/profiles/standard/config/optional/field.field.media.file.field_media_file.yml
new file mode 100644
index 0000000000..5db61f0da2
--- /dev/null
+++ b/core/profiles/standard/config/optional/field.field.media.file.field_media_file.yml
@@ -0,0 +1,29 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.media.field_media_file
+    - media.type.file
+  module:
+    - file
+  enforced:
+    module:
+      - media
+id: media.file.field_media_file
+field_name: field_media_file
+entity_type: media
+bundle: file
+label: File
+description: ''
+required: true
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings:
+  file_directory: '[date:custom:Y]-[date:custom:m]'
+  file_extensions: 'txt'
+  max_filesize: ''
+  handler: 'default:file'
+  handler_settings: {  }
+  description_field: false
+field_type: file
diff --git a/core/profiles/standard/config/optional/field.field.media.image.field_media_image.yml b/core/profiles/standard/config/optional/field.field.media.image.field_media_image.yml
new file mode 100644
index 0000000000..628c386df8
--- /dev/null
+++ b/core/profiles/standard/config/optional/field.field.media.image.field_media_image.yml
@@ -0,0 +1,40 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.media.field_media_image
+    - media.type.image
+  module:
+    - image
+  enforced:
+    module:
+      - media
+id: media.image.field_media_image
+field_name: field_media_image
+entity_type: media
+bundle: image
+label: field_media_image
+description: ''
+required: false
+translatable: true
+default_value: { }
+default_value_callback: ''
+settings:
+  file_extensions: 'png gif jpg jpeg'
+  alt_field: true
+  alt_field_required: true
+  title_field: false
+  title_field_required: false
+  max_resolution: ''
+  min_resolution: ''
+  default_image:
+    uuid: null
+    alt: ''
+    title: ''
+    width: null
+    height: null
+  file_directory: '[date:custom:Y]-[date:custom:m]'
+  max_filesize: ''
+  handler: 'default:file'
+  handler_settings: { }
+field_type: image
diff --git a/core/profiles/standard/config/optional/field.storage.media.field_media_file.yml b/core/profiles/standard/config/optional/field.storage.media.field_media_file.yml
new file mode 100644
index 0000000000..efe7954dc7
--- /dev/null
+++ b/core/profiles/standard/config/optional/field.storage.media.field_media_file.yml
@@ -0,0 +1,25 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - file
+    - media
+  enforced:
+    module:
+      - media
+id: media.field_media_file
+field_name: field_media_file
+entity_type: media
+type: file
+settings:
+  uri_scheme: public
+  target_type: file
+  display_field: false
+  display_default: false
+module: file
+locked: true
+cardinality: 1
+translatable: true
+indexes: { }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/core/profiles/standard/config/optional/field.storage.media.field_media_image.yml b/core/profiles/standard/config/optional/field.storage.media.field_media_image.yml
new file mode 100644
index 0000000000..c2049c087c
--- /dev/null
+++ b/core/profiles/standard/config/optional/field.storage.media.field_media_image.yml
@@ -0,0 +1,32 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - file
+    - image
+    - media
+  enforced:
+    module:
+      - media
+id: media.field_media_image
+field_name: field_media_image
+entity_type: media
+type: image
+settings:
+  default_image:
+    uuid: null
+    alt: ''
+    title: ''
+    width: null
+    height: null
+  target_type: file
+  display_field: false
+  display_default: false
+  uri_scheme: public
+module: image
+locked: true
+cardinality: 1
+translatable: true
+indexes: { }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/core/profiles/standard/config/optional/media.type.file.yml b/core/profiles/standard/config/optional/media.type.file.yml
new file mode 100644
index 0000000000..4bd2f46ca4
--- /dev/null
+++ b/core/profiles/standard/config/optional/media.type.file.yml
@@ -0,0 +1,14 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - media
+id: file
+label: File
+description: 'Use the "File" media type for storing media locally.'
+source: file
+queue_thumbnail_downloads: false
+new_revision: false
+source_configuration:
+  source_field: field_media_file
+field_map: { }
diff --git a/core/profiles/standard/config/optional/media.type.image.yml b/core/profiles/standard/config/optional/media.type.image.yml
new file mode 100644
index 0000000000..baea949668
--- /dev/null
+++ b/core/profiles/standard/config/optional/media.type.image.yml
@@ -0,0 +1,14 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - media
+id: image
+label: Image
+description: 'Use the "Image" media type for storing image media locally.'
+source: image
+queue_thumbnail_downloads: false
+new_revision: false
+source_configuration:
+  source_field: field_media_image
+field_map: { }