--- 2833116-47.patch	2023-04-17 16:17:26
+++ 2833116-48.patch	2023-04-17 18:03:05
@@ -62,10 +62,10 @@
      $definitions = $this->blockManager->getFilteredDefinitions('block_ui', $this->contextRepository->getAvailableContexts(), [
        'theme' => $theme,
 diff --git a/core/modules/block_content/src/BlockContentForm.php b/core/modules/block_content/src/BlockContentForm.php
-index 1a739a0988..dedcf700de 100644
+index f9ae31821c..8db132bfc7 100644
 --- a/core/modules/block_content/src/BlockContentForm.php
 +++ b/core/modules/block_content/src/BlockContentForm.php
-@@ -73,6 +73,7 @@ public function save(array $form, FormStateInterface $form_state) {
+@@ -72,6 +72,7 @@ public function save(array $form, FormStateInterface $form_state) {
            [
              'plugin_id' => 'block_content:' . $block->uuid(),
              'theme' => $theme,
@@ -74,7 +74,7 @@
          );
        }
 diff --git a/core/modules/block_content/src/Plugin/Menu/LocalAction/BlockContentAddLocalAction.php b/core/modules/block_content/src/Plugin/Menu/LocalAction/BlockContentAddLocalAction.php
-index 5b4f24ebb7..8f5119dd6c 100644
+index 9b1e220796..424fc37569 100644
 --- a/core/modules/block_content/src/Plugin/Menu/LocalAction/BlockContentAddLocalAction.php
 +++ b/core/modules/block_content/src/Plugin/Menu/LocalAction/BlockContentAddLocalAction.php
 @@ -20,6 +20,12 @@ public function getOptions(RouteMatchInterface $route_match) {
@@ -87,11 +87,11 @@
 +      $options['query']['region'] = $region;
 +    }
 +
-     // Adds a destination on custom block listing.
+     // Adds a destination on content block listing.
      if ($route_match->getRouteName() == 'entity.block_content.collection') {
        $options['query']['destination'] = Url::fromRoute('<current>')->toString();
 diff --git a/core/modules/block_content/tests/src/Functional/BlockContentListTest.php b/core/modules/block_content/tests/src/Functional/BlockContentListTest.php
-index 6a2297c193..3298e59816 100644
+index 347b037b68..41bc0d3d4e 100644
 --- a/core/modules/block_content/tests/src/Functional/BlockContentListTest.php
 +++ b/core/modules/block_content/tests/src/Functional/BlockContentListTest.php
 @@ -69,6 +69,22 @@ protected function setUp(): void {
@@ -115,7 +115,7 @@
 +  }
 +
    /**
-    * Tests the custom block listing page with different permissions.
+    * Tests the content block listing page with different permissions.
     */
 diff --git a/core/modules/menu_ui/src/Plugin/Menu/LocalAction/MenuLinkAdd.php b/core/modules/menu_ui/src/Plugin/Menu/LocalAction/MenuLinkAdd.php
 index 6424ff9f9d..f4c1f566d9 100644