diff --git a/core/lib/Drupal/Core/Entity/EntityListBuilder.php b/core/lib/Drupal/Core/Entity/EntityListBuilder.php
index 6bc9c133..5ce67129 100644
--- a/core/lib/Drupal/Core/Entity/EntityListBuilder.php
+++ b/core/lib/Drupal/Core/Entity/EntityListBuilder.php
@@ -3,6 +3,7 @@
 namespace Drupal\Core\Entity;
 
 use Drupal\Core\Messenger\MessengerTrait;
+use Drupal\Core\Operations\OperationsProviderInterface;
 use Drupal\Core\Routing\RedirectDestinationTrait;
 use Drupal\Core\Url;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -165,6 +166,11 @@ protected function getDefaultOperations(EntityInterface $entity) {
       ];
     }
 
+    // Add operation links from entity.
+    if ($entity instanceof OperationsProviderInterface && $entity->getOperationLinks()) {
+      $operations += $entity->getOperationLinks();
+    }
+
     return $operations;
   }
 
diff --git a/core/lib/Drupal/Core/Entity/EntityListBuilder.php.orig b/core/lib/Drupal/Core/Entity/EntityListBuilder.php.orig
new file mode 100644
index 00000000..6bc9c133
--- /dev/null
+++ b/core/lib/Drupal/Core/Entity/EntityListBuilder.php.orig
@@ -0,0 +1,274 @@
+<?php
+
+namespace Drupal\Core\Entity;
+
+use Drupal\Core\Messenger\MessengerTrait;
+use Drupal\Core\Routing\RedirectDestinationTrait;
+use Drupal\Core\Url;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Defines a generic implementation to build a listing of entities.
+ *
+ * @ingroup entity_api
+ */
+class EntityListBuilder extends EntityHandlerBase implements EntityListBuilderInterface, EntityHandlerInterface {
+
+  use MessengerTrait;
+  use RedirectDestinationTrait;
+
+  /**
+   * The entity storage class.
+   *
+   * @var \Drupal\Core\Entity\EntityStorageInterface
+   */
+  protected $storage;
+
+  /**
+   * The entity type ID.
+   *
+   * @var string
+   */
+  protected $entityTypeId;
+
+  /**
+   * Information about the entity type.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeInterface
+   */
+  protected $entityType;
+
+  /**
+   * The number of entities to list per page, or FALSE to list all entities.
+   *
+   * For example, set this to FALSE if the list uses client-side filters that
+   * require all entities to be listed (like the views overview).
+   *
+   * @var int|false
+   */
+  protected $limit = 50;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
+    return new static(
+      $entity_type,
+      $container->get('entity_type.manager')->getStorage($entity_type->id())
+    );
+  }
+
+  /**
+   * Constructs a new EntityListBuilder object.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type definition.
+   * @param \Drupal\Core\Entity\EntityStorageInterface $storage
+   *   The entity storage class.
+   */
+  public function __construct(EntityTypeInterface $entity_type, EntityStorageInterface $storage) {
+    $this->entityTypeId = $entity_type->id();
+    $this->storage = $storage;
+    $this->entityType = $entity_type;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getStorage() {
+    return $this->storage;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function load() {
+    $entity_ids = $this->getEntityIds();
+    return $this->storage->loadMultiple($entity_ids);
+  }
+
+  /**
+   * Loads entity IDs using a pager sorted by the entity id.
+   *
+   * @return array
+   *   An array of entity IDs.
+   */
+  protected function getEntityIds() {
+    $query = $this->getStorage()->getQuery()
+      ->sort($this->entityType->getKey('id'));
+
+    // Allow modules to alter the query to retrieve different entities.
+    // Invoke hook_entity_list_builder_alter().
+    // Invoke hook_entity_list_builder_ENTITY_TYPE_alter().
+    \Drupal::moduleHandler()->alter(['entity_list_builder', 'entity_list_builder_' . $this->entityTypeId], $query, $this->entityType);
+
+    // Only add the pager if a limit is specified.
+    if ($this->limit) {
+      $query->pager($this->limit);
+    }
+    return $query->execute();
+  }
+
+  /**
+   * Gets the label of an entity.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity being listed.
+   *
+   * @return string
+   *   The entity label.
+   *
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
+   *   Use $entity->label() instead. This method used to escape the entity
+   *   label. The render system's autoescape is now relied upon.
+   */
+  protected function getLabel(EntityInterface $entity) {
+    return $entity->label();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getOperations(EntityInterface $entity) {
+    $operations = $this->getDefaultOperations($entity);
+    $operations += $this->moduleHandler()->invokeAll('entity_operation', [$entity]);
+    $this->moduleHandler->alter('entity_operation', $operations, $entity);
+    uasort($operations, '\Drupal\Component\Utility\SortArray::sortByWeightElement');
+
+    return $operations;
+  }
+
+  /**
+   * Gets this list's default operations.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity the operations are for.
+   *
+   * @return array
+   *   The array structure is identical to the return value of
+   *   self::getOperations().
+   */
+  protected function getDefaultOperations(EntityInterface $entity) {
+    $operations = [];
+    if ($entity->access('update') && $entity->hasLinkTemplate('edit-form')) {
+      $operations['edit'] = [
+        'title' => $this->t('Edit'),
+        'weight' => 10,
+        'url' => $this->ensureDestination($entity->toUrl('edit-form')),
+      ];
+    }
+    if ($entity->access('delete') && $entity->hasLinkTemplate('delete-form')) {
+      $operations['delete'] = [
+        'title' => $this->t('Delete'),
+        'weight' => 100,
+        'url' => $this->ensureDestination($entity->toUrl('delete-form')),
+      ];
+    }
+
+    return $operations;
+  }
+
+  /**
+   * Builds the header row for the entity listing.
+   *
+   * @return array
+   *   A render array structure of header strings.
+   *
+   * @see \Drupal\Core\Entity\EntityListBuilder::render()
+   */
+  public function buildHeader() {
+    $row['operations'] = $this->t('Operations');
+    return $row;
+  }
+
+  /**
+   * Builds a row for an entity in the entity listing.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity for this row of the list.
+   *
+   * @return array
+   *   A render array structure of fields for this entity.
+   *
+   * @see \Drupal\Core\Entity\EntityListBuilder::render()
+   */
+  public function buildRow(EntityInterface $entity) {
+    $row['operations']['data'] = $this->buildOperations($entity);
+    return $row;
+  }
+
+  /**
+   * Builds a renderable list of operation links for the entity.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity on which the linked operations will be performed.
+   *
+   * @return array
+   *   A renderable array of operation links.
+   *
+   * @see \Drupal\Core\Entity\EntityListBuilder::buildRow()
+   */
+  public function buildOperations(EntityInterface $entity) {
+    $build = [
+      '#type' => 'operations',
+      '#links' => $this->getOperations($entity),
+    ];
+
+    return $build;
+  }
+
+  /**
+   * {@inheritdoc}
+   *
+   * Builds the entity listing as renderable array for table.html.twig.
+   *
+   * @todo Add a link to add a new item to the #empty text.
+   */
+  public function render() {
+    $build['table'] = [
+      '#type' => 'table',
+      '#header' => $this->buildHeader(),
+      '#title' => $this->getTitle(),
+      '#rows' => [],
+      '#empty' => $this->t('There are no @label yet.', ['@label' => $this->entityType->getPluralLabel()]),
+      '#cache' => [
+        'contexts' => $this->entityType->getListCacheContexts(),
+        'tags' => $this->entityType->getListCacheTags(),
+      ],
+    ];
+    foreach ($this->load() as $entity) {
+      if ($row = $this->buildRow($entity)) {
+        $build['table']['#rows'][$entity->id()] = $row;
+      }
+    }
+
+    // Only add the pager if a limit is specified.
+    if ($this->limit) {
+      $build['pager'] = [
+        '#type' => 'pager',
+      ];
+    }
+    return $build;
+  }
+
+  /**
+   * Gets the title of the page.
+   */
+  protected function getTitle() {
+    return;
+  }
+
+  /**
+   * Ensures that a destination is present on the given URL.
+   *
+   * @param \Drupal\Core\Url $url
+   *   The URL object to which the destination should be added.
+   *
+   * @return \Drupal\Core\Url
+   *   The updated URL object.
+   */
+  protected function ensureDestination(Url $url) {
+    return $url->mergeOptions(['query' => $this->getRedirectDestination()->getAsArray()]);
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Operations/OperationsProviderInterface.php b/core/lib/Drupal/Core/Operations/OperationsProviderInterface.php
new file mode 100644
index 00000000..95c6884e
--- /dev/null
+++ b/core/lib/Drupal/Core/Operations/OperationsProviderInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Drupal\Core\Operations;
+
+/**
+ * Defines an interface for providing operations links.
+ */
+interface OperationsProviderInterface {
+
+  /**
+   * Returns a list of operation links available for this block.
+   *
+   * @return array
+   *   Array of operation links.
+   */
+  public function getOperationLinks();
+
+}
diff --git a/core/modules/block/src/Entity/Block.php b/core/modules/block/src/Entity/Block.php
index ece8de38..0deee051 100644
--- a/core/modules/block/src/Entity/Block.php
+++ b/core/modules/block/src/Entity/Block.php
@@ -10,6 +10,7 @@
 use Drupal\Core\Config\Entity\ConfigEntityInterface;
 use Drupal\Core\Entity\EntityWithPluginCollectionInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Operations\OperationsProviderInterface;
 
 /**
  * Defines a Block configuration entity class.
@@ -59,7 +60,7 @@
  *   }
  * )
  */
-class Block extends ConfigEntityBase implements BlockInterface, EntityWithPluginCollectionInterface {
+class Block extends ConfigEntityBase implements BlockInterface, EntityWithPluginCollectionInterface, OperationsProviderInterface {
 
   /**
    * The ID of the block.
@@ -196,6 +197,18 @@ public function getWeight() {
     return $this->weight;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getOperationLinks() {
+    $plugin = $this->getPlugin();
+    $operations = [];
+    if ($plugin instanceof OperationsProviderInterface && $plugin->getOperationLinks()) {
+      $operations += $plugin->getOperationLinks();
+    }
+    return $operations;
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php b/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php
index 6ca88d19..a2194612 100644
--- a/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php
+++ b/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php
@@ -9,10 +9,12 @@
 use Drupal\Core\Entity\EntityDisplayRepositoryInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Operations\OperationsProviderInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Routing\UrlGeneratorInterface;
 use Drupal\Core\Session\AccountInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\Core\Routing\RedirectDestinationTrait;
 
 /**
  * Defines a generic custom block type.
@@ -24,7 +26,9 @@
  *  deriver = "Drupal\block_content\Plugin\Derivative\BlockContent"
  * )
  */
-class BlockContentBlock extends BlockBase implements ContainerFactoryPluginInterface {
+class BlockContentBlock extends BlockBase implements ContainerFactoryPluginInterface, OperationsProviderInterface {
+
+  use RedirectDestinationTrait;
 
   /**
    * The Plugin Block Manager.
@@ -213,4 +217,20 @@ protected function getEntity() {
     return $this->blockContent;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getOperationLinks() {
+    $entity = $this->getEntity();
+    $operations = [];
+    if ($entity->access('update') && $entity->hasLinkTemplate('edit-form')) {
+      $operations['edit_block_content'] = [
+        'title' => $this->t('Edit block content'),
+        'weight' => 20,
+        'url' => $entity->toUrl('edit-form')->mergeOptions(['query' => $this->getDestinationArray()]),
+      ];
+    }
+    return $operations;
+  }
+
 }
diff --git a/core/modules/system/src/Plugin/Block/SystemMenuBlock.php b/core/modules/system/src/Plugin/Block/SystemMenuBlock.php
index 84f34b4b..ab1dd87e 100644
--- a/core/modules/system/src/Plugin/Block/SystemMenuBlock.php
+++ b/core/modules/system/src/Plugin/Block/SystemMenuBlock.php
@@ -8,8 +8,11 @@
 use Drupal\Core\Menu\MenuActiveTrailInterface;
 use Drupal\Core\Menu\MenuLinkTreeInterface;
 use Drupal\Core\Menu\MenuTreeParameters;
+use Drupal\Core\Operations\OperationsProviderInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\Core\Routing\RedirectDestinationTrait;
+use Drupal\system\Entity\Menu;
 
 /**
  * Provides a generic Menu block.
@@ -24,7 +27,9 @@
  *   },
  * )
  */
-class SystemMenuBlock extends BlockBase implements ContainerFactoryPluginInterface {
+class SystemMenuBlock extends BlockBase implements ContainerFactoryPluginInterface, OperationsProviderInterface {
+
+  use RedirectDestinationTrait;
 
   /**
    * The menu link tree service.
@@ -236,4 +241,20 @@ public function getCacheContexts() {
     return Cache::mergeContexts(parent::getCacheContexts(), ['route.menu_active_trails:' . $menu_name]);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getOperationLinks() {
+    $entity = Menu::load($this->getDerivativeId());
+    $operations = [];
+    if ($entity->hasLinkTemplate('edit-form')) {
+      $operations['edit_menu'] = [
+        'title' => $this->t('Edit menu'),
+        'weight' => 20,
+        'url' => $entity->toUrl('edit-form')->mergeOptions(['query' => $this->getDestinationArray()]),
+      ];
+    }
+    return $operations;
+  }
+
 }