core/core.services.yml                                                | 2 +-
 core/modules/node/src/NodeServiceProvider.php                         | 4 +++-
 .../src/Controller/NodeAccessTestAutoBubblingController.php           | 2 +-
 core/modules/user/src/UserServiceProvider.php                         | 2 +-
 sites/default/default.services.yml                                    | 4 ++--
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/core/core.services.yml b/core/core.services.yml
index fc2695f..4537900 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -14,7 +14,7 @@ parameters:
       max-age: 0
       contexts: ['session', 'user']
       tags: []
-  cacheability_safeguards: true
+  renderer.cacheability_safeguards: true
   factory.keyvalue:
     default: keyvalue.database
   factory.keyvalue.expirable:
diff --git a/core/modules/node/src/NodeServiceProvider.php b/core/modules/node/src/NodeServiceProvider.php
index 8a0f6a2..b1f18c9 100644
--- a/core/modules/node/src/NodeServiceProvider.php
+++ b/core/modules/node/src/NodeServiceProvider.php
@@ -20,8 +20,10 @@ class NodeServiceProvider implements ServiceModifierInterface {
    * {@inheritdoc}
    */
   public function alter(ContainerBuilder $container) {
+    $container->setAlias('node.grant_storage.non_bubbling', 'node.grant_storage');
+
     // Allow sites to opt out from the cacheability safeguards.
-    if ($container->hasParameter('cacheability_safeguards') && $container->getParameter('cacheability_safeguards') === FALSE) {
+    if ($container->hasParameter('renderer.cacheability_safeguards') && $container->getParameter('renderer.cacheability_safeguards') === FALSE) {
       return;
     }
 
diff --git a/core/modules/node/tests/node_access_test_auto_bubbling/src/Controller/NodeAccessTestAutoBubblingController.php b/core/modules/node/tests/node_access_test_auto_bubbling/src/Controller/NodeAccessTestAutoBubblingController.php
index c7788d0..89e7ce4 100644
--- a/core/modules/node/tests/node_access_test_auto_bubbling/src/Controller/NodeAccessTestAutoBubblingController.php
+++ b/core/modules/node/tests/node_access_test_auto_bubbling/src/Controller/NodeAccessTestAutoBubblingController.php
@@ -56,7 +56,7 @@ public function latest() {
       ->range(0, 3)
       ->addTag('node_access')
       ->execute();
-    return ['#markup' => $this->t('The three latest nodes are: !nids.', ['!nids' => implode(', ', $nids)])];
+    return ['#markup' => $this->t('The three latest nodes are: @nids.', ['@nids' => implode(', ', $nids)])];
   }
 
 }
diff --git a/core/modules/user/src/UserServiceProvider.php b/core/modules/user/src/UserServiceProvider.php
index a8d5adb..42454cf 100644
--- a/core/modules/user/src/UserServiceProvider.php
+++ b/core/modules/user/src/UserServiceProvider.php
@@ -27,7 +27,7 @@ public function alter(ContainerBuilder $container) {
     $container->setDefinition('password', $container->getDefinition('password_migrate'));
 
     // Allow sites to opt out from the cacheability safeguards.
-    if ($container->hasParameter('cacheability_safeguards') && $container->getParameter('cacheability_safeguards') === FALSE) {
+    if ($container->hasParameter('renderer.cacheability_safeguards') && $container->getParameter('renderer.cacheability_safeguards') === FALSE) {
       return;
     }
 
diff --git a/sites/default/default.services.yml b/sites/default/default.services.yml
index 39c89b2..b1bf2b2 100644
--- a/sites/default/default.services.yml
+++ b/sites/default/default.services.yml
@@ -115,8 +115,8 @@ parameters:
       #
       # @default []
       tags: []
-  # Whether cacheability safeguards should be enabled or not.
-  cacheability_safeguards: true
+  # Whether renderer cacheability safeguards should be enabled or not.
+  renderer.cacheability_safeguards: true
   factory.keyvalue:
     {}
     # Default key/value storage service to use.