diff --git a/core/modules/field/field.crud.inc b/core/modules/field/field.crud.inc
index b748c51..c16a7a6 100644
--- a/core/modules/field/field.crud.inc
+++ b/core/modules/field/field.crud.inc
@@ -517,12 +517,15 @@ function field_create_instance($instance) {
  *   Read-only_id properties are assigned automatically. Any other
  *   properties specified in $instance overwrite the existing values for
  *   the instance.
+ * @param $reset
+ *   An optional boolean to control whether or not the field cache should
+ *   be refreshed. Defaults to TRUE.
  *
  * @throws Drupal\field\FieldException
  *
  * @see field_create_instance()
  */
-function field_update_instance($instance) {
+function field_update_instance($instance, $reset = TRUE) {
   // Check that the specified field exists.
   $field = field_read_field($instance['field_name']);
   if (empty($field)) {
@@ -541,8 +544,10 @@ function field_update_instance($instance) {
 
   _field_write_instance($instance, TRUE);
 
-  // Clear caches.
-  field_cache_clear();
+  if ($reset) {
+    // Clear caches by default.
+    field_cache_clear();
+  }
 
   module_invoke_all('field_update_instance', $instance, $prior_instance);
 }
diff --git a/core/modules/field_ui/field_ui.admin.inc b/core/modules/field_ui/field_ui.admin.inc
index 5871be0..11698c6 100644
--- a/core/modules/field_ui/field_ui.admin.inc
+++ b/core/modules/field_ui/field_ui.admin.inc
@@ -792,7 +792,11 @@ function field_ui_field_overview_form_submit($form, &$form_state) {
     if (in_array($key, $form['#fields'])) {
       $instance = field_read_instance($entity_type, $key, $bundle);
       $instance['widget']['weight'] = $values['weight'];
-      field_update_instance($instance);
+
+      // Prevent the cache from being cleared repeatedly. Cache will be cleared
+      // when the field instance is created, but not an additional number equal
+      // to the number of field instances on this entity.
+      field_update_instance($instance, FALSE);
     }
     elseif (in_array($key, $form['#extra'])) {
       $bundle_settings['extra_fields']['form'][$key]['weight'] = $values['weight'];
@@ -1428,10 +1432,15 @@ function _field_ui_add_default_view_mode_settings($entity_type, $bundle, $view_m
       // The instance doesn't specify anything for this view mode, so use the
       // default display settings.
       $instance['display'][$view_mode] = $instance['display']['default'];
-      field_update_instance($instance);
+
+      // Prevent the cache from being cleared repeatedly.
+      field_update_instance($instance, FALSE);
     }
   }
 
+  // Cache will be cleared after all instances have been processed.
+  field_cache_clear();
+
   // Update display settings for 'extra fields'.
   foreach (array_keys($settings['extra_fields']['display']) as $name) {
     if (!isset($settings['extra_fields']['display'][$name][$view_mode])) {
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index 2c12638..ba17413 100755
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -5,51 +5,41 @@
  * Drupal site-specific configuration file.
  *
  * IMPORTANT NOTE:
- * This file may have been set to read-only by the Drupal installation program.
- * If you make changes to this file, be sure to protect it again after making
- * your modifications. Failure to remove write permissions to this file is a
- * security risk.
- *
- * The configuration file to be loaded is based upon the rules below. However
- * if the multisite aliasing file named sites/sites.php is present, it will be
- * loaded, and the aliases in the array $sites will override the default
- * directory rules below. See sites/example.sites.php for more information about
- * aliases.
- *
- * The configuration directory will be discovered by stripping the website's
- * hostname from left to right and pathname from right to left. The first
- * configuration file found will be used and any others will be ignored. If no
- * other configuration file is found then the default configuration file at
- * 'sites/default' will be used.
+ * This file may have been set to read-only by the Drupal installation
+ * program. If you make changes to this file, be sure to protect it again
+ * after making your modifications. Failure to remove write permissions
+ * to this file is a security risk.
+ *
+ * The configuration file to be loaded is based upon the rules below.
+ *
+ * The configuration directory will be discovered by stripping the
+ * website's hostname from left to right and pathname from right to
+ * left. The first configuration file found will be used and any
+ * others will be ignored. If no other configuration file is found
+ * then the default configuration file at 'sites/default' will be used.
  *
  * For example, for a fictitious site installed at
- * http://www.drupal.org:8080/mysite/test/, the 'settings.php' file is searched
- * for in the following directories:
+ * http://www.drupal.org/mysite/test/, the 'settings.php'
+ * is searched in the following directories:
  *
- * - sites/8080.www.drupal.org.mysite.test
  * - sites/www.drupal.org.mysite.test
  * - sites/drupal.org.mysite.test
  * - sites/org.mysite.test
  *
- * - sites/8080.www.drupal.org.mysite
  * - sites/www.drupal.org.mysite
  * - sites/drupal.org.mysite
  * - sites/org.mysite
  *
- * - sites/8080.www.drupal.org
  * - sites/www.drupal.org
  * - sites/drupal.org
  * - sites/org
  *
  * - sites/default
  *
- * Note that if you are installing on a non-standard port number, prefix the
+ * If you are installing on a non-standard port number, prefix the
  * hostname with that number. For example,
  * http://www.drupal.org:8080/mysite/test/ could be loaded from
  * sites/8080.www.drupal.org.mysite.test/.
- *
- * @see example.sites.php
- * @see conf_path()
  */
 
 /**