diff --git a/core/modules/field/tests/modules/field_test/config/schema/field_test.schema.yml b/core/modules/field/tests/modules/field_test/config/schema/field_test.schema.yml
index e9d41a4..0ff333e 100644
--- a/core/modules/field/tests/modules/field_test/config/schema/field_test.schema.yml
+++ b/core/modules/field/tests/modules/field_test/config/schema/field_test.schema.yml
@@ -34,7 +34,7 @@ field.formatter.settings.field_test_with_prepare_view:
       label: 'Test setting'
 
 field.widget.settings.test_field_widget:
-  type: maping
+  type: mapping
   label: 'Test field widget settings'
   mapping:
     test_widget_setting:
@@ -63,6 +63,10 @@ field.storage_settings.test_field:
       type: string
       label: 'An unchangeable field storage setting'
 
+field.storage_settings.test_field_with_dependencies:
+  type: field.storage_settings.test_field
+  label: 'Test field with dependencies storage settings'
+
 field.storage_settings.hidden_test_field:
   type: field.storage_settings.test_field
   label: 'Hidden test field storage settings'
@@ -75,6 +79,14 @@ field.field_settings.test_field:
       type: string
       label: 'Test field setting'
 
+field.field_settings.test_field_with_dependencies:
+  type: field.field_settings.test_field
+  label: 'Test field with dependencies field settings'
+
+field.field_settings.hidden_test_field:
+  type: field.field_settings.test_field
+  label: 'Hidden test field field settings'
+
 field.value.test_field:
   type: mapping
   label: 'Default value'
@@ -82,3 +94,11 @@ field.value.test_field:
     value:
       type: label
       label: 'Value'
+
+entity_view_display.third_party.field_test:
+  type: mapping
+  label: 'Field test entity display third party setting'
+  mapping:
+    foo:
+      type: string
+      label: 'Test setting'
diff --git a/core/modules/field_ui/src/Tests/EntityDisplayTest.php b/core/modules/field_ui/src/Tests/EntityDisplayTest.php
index 8d5f40c..efcd9e0 100644
--- a/core/modules/field_ui/src/Tests/EntityDisplayTest.php
+++ b/core/modules/field_ui/src/Tests/EntityDisplayTest.php
@@ -57,7 +57,7 @@ public function testEntityDisplayCRUD() {
     $this->assertEqual($display->getComponent('component_2'), $expected['component_2']);
 
     // Check that arbitrary options are correctly stored.
-    $expected['component_3'] = array('weight' => 10, 'foo' => 'bar');
+    $expected['component_3'] = array('weight' => 10, 'third_party_settings' => array('field_test' => array('foo' => 'bar')));
     $display->setComponent('component_3', $expected['component_3']);
     $this->assertEqual($display->getComponent('component_3'), $expected['component_3']);
 
diff --git a/core/modules/link/config/schema/link.schema.yml b/core/modules/link/config/schema/link.schema.yml
index d489174..01a8a65 100644
--- a/core/modules/link/config/schema/link.schema.yml
+++ b/core/modules/link/config/schema/link.schema.yml
@@ -21,18 +21,8 @@ field.formatter.settings.link:
       label: 'Open link in new window'
 
 field.formatter.settings.link_separate:
-  type: mapping
+  type: field.formatter.settings.link
   label: 'Link format settings'
-  mapping:
-    trim_length:
-      type: integer
-      label: 'Trim link text length'
-    rel:
-      type: string
-      label: 'Add rel="nofollow" to links'
-    target:
-      type: string
-      label: 'Open link in new window'
 
 field.widget.settings.link_default:
   type: mapping