diff --git a/core/modules/search/lib/Drupal/search/Form/SearchSettingsForm.php b/core/modules/search/lib/Drupal/search/Form/SearchSettingsForm.php
index 5d68083..a991eec 100644
--- a/core/modules/search/lib/Drupal/search/Form/SearchSettingsForm.php
+++ b/core/modules/search/lib/Drupal/search/Form/SearchSettingsForm.php
@@ -6,8 +6,8 @@
 
 namespace Drupal\search\Form;
 
-use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Config\ConfigFactory;
+use Drupal\Core\Config\Context\ContextInterface;
 use Drupal\Core\Extension\ModuleHandler;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\KeyValueStore\KeyValueStoreInterface;
@@ -52,7 +52,9 @@ class SearchSettingsForm extends SystemConfigFormBase {
    * Constructs a \Drupal\search\Form\SearchSettingsForm object.
    *
    * @param \Drupal\Core\Config\ConfigFactory $config_factory
-   *   The config factory.
+   *   The configuration factory object that manages search settings.
+   * @param \Drupal\Core\Config\Context\ContextInterface $context
+   *   The context interface
    * @param \Drupal\search\SearchPluginManager $manager
    *   The manager for search plugins.
    * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
@@ -60,7 +62,8 @@ class SearchSettingsForm extends SystemConfigFormBase {
    * @param \Drupal\Core\KeyValueStore\KeyValueStoreInterface $state
    *   The state key/value store interface, gives access to state based config settings.
    */
-  public function __construct(ConfigFactory $config_factory, SearchPluginManager $manager, ModuleHandlerInterface $module_handler, KeyValueStoreInterface $state) {
+  public function __construct(ConfigFactory $config_factory, ContextInterface $context, SearchPluginManager $manager, ModuleHandlerInterface $module_handler, KeyValueStoreInterface $state) {
+    parent::__construct($config_factory, $context);
     $this->searchSettings = $config_factory->get('search.settings');
     $this->searchPluginManager = $manager;
     $this->moduleHandler = $module_handler;
@@ -73,6 +76,7 @@ public function __construct(ConfigFactory $config_factory, SearchPluginManager $
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
+      $container->get('config.context.free'),
       $container->get('plugin.manager.search'),
       $container->get('module_handler'),
       $container->get('state')