diff --git a/core/lib/Drupal.php b/core/lib/Drupal.php
index 141686f..1c48f4a 100644
--- a/core/lib/Drupal.php
+++ b/core/lib/Drupal.php
@@ -297,12 +297,14 @@ public static function lock() {
    *   The name of the configuration object to retrieve. The name corresponds to
    *   a configuration file. For @code \Drupal::config('book.admin') @endcode, the config
    *   object returned will contain the contents of book.admin configuration file.
+   * @param bool $mutable
+   *   (optional) Create an mutable configuration object. Defaults to TRUE.
    *
    * @return \Drupal\Core\Config\Config
    *   A configuration object.
    */
-  public static function config($name) {
-    return static::$container->get('config.factory')->get($name);
+  public static function config($name, $mutable = TRUE) {
+    return static::$container->get('config.factory')->get($name, $mutable);
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Config/ConfigFactory.php b/core/lib/Drupal/Core/Config/ConfigFactory.php
index 970a500..38df2d0 100644
--- a/core/lib/Drupal/Core/Config/ConfigFactory.php
+++ b/core/lib/Drupal/Core/Config/ConfigFactory.php
@@ -104,12 +104,12 @@ public function getOverrideState() {
   /**
    * {@inheritdoc}
    */
-  public function get($name) {
-    if ($config = $this->loadMultiple(array($name))) {
+  public function get($name, $mutable = TRUE) {
+    if ($config = $this->loadMultiple(array($name), $mutable)) {
       return $config[$name];
     }
     else {
-      $cache_key = $this->getConfigCacheKey($name);
+      $cache_key = $this->getConfigCacheKey($name, $mutable);
       // If the config object has been deleted it will already exist in the
       // cache but self::loadMultiple does not return such objects.
       // @todo Explore making ConfigFactory a listener to the config.delete
@@ -118,7 +118,7 @@ public function get($name) {
         // If the configuration object does not exist in the configuration
         // storage or static cache create a new object and add it to the static
         // cache.
-        $this->cache[$cache_key] = new Config($name, $this->storage, $this->eventDispatcher, $this->typedConfigManager);
+        $this->cache[$cache_key] = $this->createConfigObject($name, $mutable);
 
         if ($this->useOverrides) {
           // Get and apply any overrides.
@@ -139,13 +139,13 @@ public function get($name) {
   /**
    * {@inheritdoc}
    */
-  public function loadMultiple(array $names) {
+  public function loadMultiple(array $names, $mutable = TRUE) {
     $list = array();
 
     foreach ($names as $key => $name) {
       // @todo: Deleted configuration stays in $this->cache, only return
       //   configuration objects that are not new.
-      $cache_key = $this->getConfigCacheKey($name);
+      $cache_key = $this->getConfigCacheKey($name, $mutable);
       if (isset($this->cache[$cache_key]) && !$this->cache[$cache_key]->isNew()) {
         $list[$name] = $this->cache[$cache_key];
         unset($names[$key]);
@@ -164,9 +164,9 @@ public function loadMultiple(array $names) {
       }
 
       foreach ($storage_data as $name => $data) {
-        $cache_key = $this->getConfigCacheKey($name);
+        $cache_key = $this->getConfigCacheKey($name, $mutable);
 
-        $this->cache[$cache_key] = new Config($name, $this->storage, $this->eventDispatcher, $this->typedConfigManager);
+        $this->cache[$cache_key] = $this->createConfigObject($name, $mutable);
         $this->cache[$cache_key]->initWithData($data);
         if ($this->useOverrides) {
           if (isset($module_overrides[$name])) {
@@ -226,15 +226,15 @@ public function reset($name = NULL) {
   /**
    * {@inheritdoc}
    */
-  public function rename($old_name, $new_name) {
+  public function rename($old_name, $new_name, $mutable = TRUE) {
     $this->storage->rename($old_name, $new_name);
-    $old_cache_key = $this->getConfigCacheKey($old_name);
-    if (isset($this->cache[$old_cache_key])) {
+    $old_cache_keys = $this->getConfigCacheKeys($old_name);
+    foreach ($old_cache_keys as $old_cache_key) {
       unset($this->cache[$old_cache_key]);
     }
 
     // Prime the cache and load the configuration with the correct overrides.
-    $config = $this->get($new_name);
+    $config = $this->get($new_name, $mutable);
     $this->eventDispatcher->dispatch(ConfigEvents::RENAME, new ConfigRenameEvent($config, $old_name));
     return $config;
   }
@@ -260,12 +260,14 @@ public function getCacheKeys() {
    *
    * @param string $name
    *   The name of the configuration object.
+   * @param bool $mutable
+   *   Whether or not the object is mutable.
    *
    * @return string
    *   The cache key.
    */
-  protected function getConfigCacheKey($name) {
-    return $name . ':' . implode(':', $this->getCacheKeys());
+  protected function getConfigCacheKey($name, $mutable) {
+    return $name . ':' . implode(':', $this->getCacheKeys()) . ':' . ($mutable ? static::MUTABLE: static::IMMUTABLE);
   }
 
   /**
@@ -333,4 +335,22 @@ public function addOverride(ConfigFactoryOverrideInterface $config_factory_overr
     $this->configFactoryOverrides[] = $config_factory_override;
   }
 
+  /**
+   * Creates a configuration object.
+   *
+   * @param string $name
+   *   Configuration object name.
+   * @param bool $mutable
+   *   Determines whether a mutable or immutable config object is returned.
+   *
+   * @return \Drupal\Core\Config\Config|\Drupal\Core\Config\ImmutableConfig
+   *   The configuration object.
+   */
+  protected function createConfigObject($name, $mutable) {
+    if (!$mutable) {
+      return new ImmutableConfig($name, $this->storage, $this->eventDispatcher, $this->typedConfigManager);
+    }
+    return new Config($name, $this->storage, $this->eventDispatcher, $this->typedConfigManager);
+
+  }
 }
diff --git a/core/lib/Drupal/Core/Config/ConfigFactoryInterface.php b/core/lib/Drupal/Core/Config/ConfigFactoryInterface.php
index d51e023..751007b 100644
--- a/core/lib/Drupal/Core/Config/ConfigFactoryInterface.php
+++ b/core/lib/Drupal/Core/Config/ConfigFactoryInterface.php
@@ -15,6 +15,16 @@
 interface ConfigFactoryInterface {
 
   /**
+   * Constant used in static cache keys for mutable config objects.
+   */
+  const MUTABLE = 'mutable';
+
+  /**
+   * Constant used in static cache keys for immutable config objects.
+   */
+  const IMMUTABLE = 'immutable';
+
+  /**
    * Sets the override state.
    *
    * @param bool $state
@@ -37,11 +47,13 @@ public function getOverrideState();
    *
    * @param string $name
    *   The name of the configuration object to construct.
+   * @param bool $mutable
+   *   (optional) Create an mutable configuration object. Defaults to TRUE.
    *
-   * @return \Drupal\Core\Config\Config
+   * @return \Drupal\Core\Config\Config|\Drupal\Core\Config\ImmutableConfig
    *   A configuration object.
    */
-  public function get($name);
+  public function get($name, $mutable = TRUE);
 
   /**
    * Returns a list of configuration objects for the given names.
@@ -51,11 +63,13 @@ public function get($name);
    *
    * @param array $names
    *   List of names of configuration objects.
+   * @param bool $mutable
+   *   (optional) Create an mutable configuration object. Defaults to TRUE.
    *
-   * @return \Drupal\Core\Config\Config[]
+   * @return \Drupal\Core\Config\Config[]|\Drupal\Core\Config\ImmutableConfig[]
    *   List of successfully loaded configuration objects, keyed by name.
    */
-  public function loadMultiple(array $names);
+  public function loadMultiple(array $names, $mutable = TRUE);
 
   /**
    * Resets and re-initializes configuration objects. Internal use only.
@@ -75,11 +89,13 @@ public function reset($name = NULL);
    *   The old name of the configuration object.
    * @param string $new_name
    *   The new name of the configuration object.
+   * @param bool $mutable
+   *   (optional) Create an mutable configuration object. Defaults to TRUE.
    *
    * @return \Drupal\Core\Config\Config
    *   The renamed config object.
    */
-  public function rename($old_name, $new_name);
+  public function rename($old_name, $new_name, $mutable = TRUE);
 
   /**
    * The cache keys associated with the state of the config factory.
diff --git a/core/lib/Drupal/Core/Config/ImmutableConfig.php b/core/lib/Drupal/Core/Config/ImmutableConfig.php
new file mode 100644
index 0000000..828f8ba
--- /dev/null
+++ b/core/lib/Drupal/Core/Config/ImmutableConfig.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: alex
+ * Date: 12/12/14
+ * Time: 15:53
+ */
+
+namespace Drupal\Core\Config;
+
+
+class ImmutableConfig extends Config {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function set($key, $value) {
+    throw new ImmutableConfigException();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function clear($key) {
+    throw new ImmutableConfigException();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function save() {
+    throw new ImmutableConfigException();
+  }
+
+  /**
+   * Deletes the configuration object.
+   *
+   * @return \Drupal\Core\Config\Config
+   *   The configuration object.
+   */
+  public function delete() {
+    throw new ImmutableConfigException();
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Config/ImmutableConfigException.php b/core/lib/Drupal/Core/Config/ImmutableConfigException.php
new file mode 100644
index 0000000..f5e0e17
--- /dev/null
+++ b/core/lib/Drupal/Core/Config/ImmutableConfigException.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: alex
+ * Date: 12/12/14
+ * Time: 15:57
+ */
+
+namespace Drupal\Core\Config;
+
+
+class ImmutableConfigException extends \RuntimeException {
+}
diff --git a/core/lib/Drupal/Core/Form/FormBase.php b/core/lib/Drupal/Core/Form/FormBase.php
index 3a14612..3039fb9 100644
--- a/core/lib/Drupal/Core/Form/FormBase.php
+++ b/core/lib/Drupal/Core/Form/FormBase.php
@@ -80,11 +80,12 @@ public function validateForm(array &$form, FormStateInterface $form_state) {
    *   the config object returned will contain the contents of book.admin
    *   configuration file.
    *
-   * @return \Drupal\Core\Config\Config
-   *   A configuration object.
+   * @return \Drupal\Core\Config\ImmutableConfig
+   *   A configuration object which cannot be changed. If the form is saving
+   *   configuration \Drupal\Core\Form\ConfigFormBase is preferred.
    */
   protected function config($name) {
-    return $this->configFactory()->get($name);
+    return $this->configFactory()->get($name, FALSE);
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Installer/Form/SiteConfigureForm.php b/core/lib/Drupal/Core/Installer/Form/SiteConfigureForm.php
index 750e967..ba55764 100644
--- a/core/lib/Drupal/Core/Installer/Form/SiteConfigureForm.php
+++ b/core/lib/Drupal/Core/Installer/Form/SiteConfigureForm.php
@@ -8,7 +8,7 @@
 namespace Drupal\Core\Installer\Form;
 
 use Drupal\Core\Extension\ModuleInstallerInterface;
-use Drupal\Core\Form\FormBase;
+use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Locale\CountryManagerInterface;
 use Drupal\Core\State\StateInterface;
@@ -18,7 +18,7 @@
 /**
  * Provides the site configuration form.
  */
-class SiteConfigureForm extends FormBase {
+class SiteConfigureForm extends ConfigFormBase {
 
   /**
    * The user storage.
diff --git a/core/lib/Drupal/Core/Menu/StaticMenuLinkOverrides.php b/core/lib/Drupal/Core/Menu/StaticMenuLinkOverrides.php
index ebde906..9efd096 100644
--- a/core/lib/Drupal/Core/Menu/StaticMenuLinkOverrides.php
+++ b/core/lib/Drupal/Core/Menu/StaticMenuLinkOverrides.php
@@ -80,7 +80,9 @@ public function loadOverride($id) {
    * {@inheritdoc}
    */
   public function deleteMultipleOverrides(array $ids) {
-    $all_overrides = $this->getConfig()->get('definitions');
+    // Get the original configuration without overrides to ensure that global
+    // overrides are saved to configuration.
+    $all_overrides = $this->getConfig()->getOriginal('definitions', FALSE);
     $save = FALSE;
     foreach ($ids as $id) {
       $id = static::encodeId($id);
@@ -135,7 +137,9 @@ public function saveOverride($id, array $definition) {
     $definition = array_intersect_key($definition, $expected);
     if ($definition) {
       $id = static::encodeId($id);
-      $all_overrides = $this->getConfig()->get('definitions');
+      // Get the original configuration without overrides to ensure that global
+      // overrides are saved to configuration.
+      $all_overrides = $this->getConfig()->getOriginal('definitions', FALSE);
       // Combine with any existing data.
       $all_overrides[$id] = $definition + $this->loadOverride($id);
       $this->getConfig()->set('definitions', $all_overrides)->save();
