diff --git a/core/lib/Drupal/Core/Entity/ContentEntityBase.php b/core/lib/Drupal/Core/Entity/ContentEntityBase.php
index 1a27716..357db02 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityBase.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityBase.php
@@ -1131,9 +1131,6 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
     if ($entity_type->hasKey('uuid')) {
       $fields[$entity_type->getKey('uuid')] = BaseFieldDefinition::create('uuid')
         ->setLabel(new TranslatableMarkup('UUID'))
-//        ->setDisplayOptions('view', [
-//          'type' => 'hidden',
-//        ])
         ->setReadOnly(TRUE);
     }
     if ($entity_type->hasKey('revision')) {
diff --git a/core/lib/Drupal/Core/Entity/Entity/EntityViewDisplay.php b/core/lib/Drupal/Core/Entity/Entity/EntityViewDisplay.php
index b6d51d1..b4a616a 100644
--- a/core/lib/Drupal/Core/Entity/Entity/EntityViewDisplay.php
+++ b/core/lib/Drupal/Core/Entity/Entity/EntityViewDisplay.php
@@ -257,7 +257,6 @@ public function buildMultiple(array $entities) {
             $view_langcode = NULL;
           }
           $build_list[$id][$name] = $field_access->isAllowed() ? $formatter->view($items, $view_langcode) : [];
-
           // Apply the field access cacheability metadata to the render array.
           $this->renderer->addCacheableDependency($build_list[$id][$name], $field_access);
         }
diff --git a/core/lib/Drupal/Core/Field/FormatterPluginManager.php b/core/lib/Drupal/Core/Field/FormatterPluginManager.php
index 42c9c03..65e1d3a 100644
--- a/core/lib/Drupal/Core/Field/FormatterPluginManager.php
+++ b/core/lib/Drupal/Core/Field/FormatterPluginManager.php
@@ -57,8 +57,9 @@ public function createInstance($plugin_id, array $configuration = array()) {
     $plugin_class = DefaultFactory::getPluginClass($plugin_id, $plugin_definition);
 
     // @TODO, is this missing somewhere else?
-    if (empty($configuration['label'])) {
+    if (!isset($configuration['label'])) {
       $configuration['label'] = '';
+      assert(FALSE, sprintf('The %s does not have a label', $plugin_id));
     }
 
     // @todo This is copied from \Drupal\Core\Plugin\Factory\ContainerFactory.