diff --git a/core/modules/contact/src/Tests/ContactPersonalTest.php b/core/modules/contact/src/Tests/ContactPersonalTest.php
index 51124c9..2e091c5 100644
--- a/core/modules/contact/src/Tests/ContactPersonalTest.php
+++ b/core/modules/contact/src/Tests/ContactPersonalTest.php
@@ -19,6 +19,15 @@
 class ContactPersonalTest extends WebTestBase {
 
   /**
+   * Set to TRUE to strict check all configuration saved.
+   *
+   * @see \Drupal\Core\Config\Testing\ConfigSchemaChecker
+   *
+   * @var bool
+   */
+  protected $strictConfigSchema = TRUE;
+
+  /**
    * Modules to enable.
    *
    * @var array
diff --git a/core/modules/contact/src/Tests/ContactSitewideTest.php b/core/modules/contact/src/Tests/ContactSitewideTest.php
index be909f5..5131a44 100644
--- a/core/modules/contact/src/Tests/ContactSitewideTest.php
+++ b/core/modules/contact/src/Tests/ContactSitewideTest.php
@@ -21,6 +21,15 @@
 class ContactSitewideTest extends WebTestBase {
 
   /**
+   * Set to TRUE to strict check all configuration saved.
+   *
+   * @see \Drupal\Core\Config\Testing\ConfigSchemaChecker
+   *
+   * @var bool
+   */
+  protected $strictConfigSchema = TRUE;
+
+  /**
    * Modules to enable.
    *
    * @var array
diff --git a/core/modules/contact/src/Tests/ContactStorageTest.php b/core/modules/contact/src/Tests/ContactStorageTest.php
index 79b3cfd..6cb9bdf 100644
--- a/core/modules/contact/src/Tests/ContactStorageTest.php
+++ b/core/modules/contact/src/Tests/ContactStorageTest.php
@@ -8,7 +8,6 @@
 namespace Drupal\contact\Tests;
 
 use Drupal\Component\Utility\Unicode;
-use Drupal\config\Tests\SchemaCheckTestTrait;
 use Drupal\contact\Entity\Message;
 
 /**
@@ -16,8 +15,6 @@
  */
 class ContactStorageTest extends ContactSitewideTest {
 
-  use SchemaCheckTestTrait;
-
   /**
    * Modules to enable.
    *
@@ -79,7 +76,6 @@ public function testContactStorage() {
 
     $config = \Drupal::config("contact.form.$id");
     $this->assertEqual($config->get('id'), $id);
-    $this->assertConfigSchema(\Drupal::service('config.typed'), $config->getName(), $config->get());
   }
 
 }
diff --git a/core/modules/contact/src/Tests/Views/ContactLinkTest.php b/core/modules/contact/src/Tests/Views/ContactLinkTest.php
index bb7fb91..060d1b8 100644
--- a/core/modules/contact/src/Tests/Views/ContactLinkTest.php
+++ b/core/modules/contact/src/Tests/Views/ContactLinkTest.php
@@ -19,6 +19,15 @@
 class ContactLinkTest extends ViewTestBase {
 
   /**
+   * Set to TRUE to strict check all configuration saved.
+   *
+   * @see \Drupal\Core\Config\Testing\ConfigSchemaChecker
+   *
+   * @var bool
+   */
+  protected $strictConfigSchema = TRUE;
+
+  /**
    * Stores the user data service used by the test.
    *
    * @var \Drupal\user\UserDataInterface
diff --git a/core/modules/contact/tests/modules/contact_test_views/test_views/views.view.test_contact_link.yml b/core/modules/contact/tests/modules/contact_test_views/test_views/views.view.test_contact_link.yml
index 4553cfe..7d0bd5e 100644
--- a/core/modules/contact/tests/modules/contact_test_views/test_views/views.view.test_contact_link.yml
+++ b/core/modules/contact/tests/modules/contact_test_views/test_views/views.view.test_contact_link.yml
@@ -101,6 +101,7 @@ display:
           hide_alter_empty: true
           anonymous_text: ''
           format_username: true
+          plugin_id: user_name
         contact:
           id: contact
           table: users
@@ -116,6 +117,7 @@ display:
           expose:
             operator: '0'
           group: 1
+          plugin_id: boolean
       sorts: {  }
       title: test_contact_link
       header: {  }
diff --git a/core/modules/system/config/schema/system.schema.yml b/core/modules/system/config/schema/system.schema.yml
index af52582..857b7c7 100644
--- a/core/modules/system/config/schema/system.schema.yml
+++ b/core/modules/system/config/schema/system.schema.yml
@@ -38,6 +38,9 @@ system.site:
     langcode:
       type: string
       label: 'Default language'
+    mail_notification:
+      type: string
+      label: 'Notification email address'
 
 system.maintenance:
   type: mapping
diff --git a/core/modules/user/config/install/user.settings.yml b/core/modules/user/config/install/user.settings.yml
index fbb0d98..bf3d5bc 100644
--- a/core/modules/user/config/install/user.settings.yml
+++ b/core/modules/user/config/install/user.settings.yml
@@ -6,7 +6,7 @@ notify:
   password_reset: true
   status_activated: true
   status_blocked: false
-  status_cancelled: false
+  status_canceled: false
   register_admin_created: true
   register_no_approval_required: true
   register_pending_approval: true
diff --git a/core/modules/user/config/schema/user.schema.yml b/core/modules/user/config/schema/user.schema.yml
index 1780d0a..772deea 100644
--- a/core/modules/user/config/schema/user.schema.yml
+++ b/core/modules/user/config/schema/user.schema.yml
@@ -29,7 +29,7 @@ user.settings:
         status_blocked:
           type: boolean
           label: 'Account blocked'
-        status_cancelled:
+        status_canceled:
           type: boolean
           label: 'Account canceled'
         register_admin_created: