diff --git a/core/lib/Drupal/Core/Config/ConfigInstaller.php b/core/lib/Drupal/Core/Config/ConfigInstaller.php
index ffdc760..35c37f4 100644
--- a/core/lib/Drupal/Core/Config/ConfigInstaller.php
+++ b/core/lib/Drupal/Core/Config/ConfigInstaller.php
@@ -9,6 +9,7 @@
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Config\Entity\ConfigDependencyManager;
+use Drupal\Core\Config\Entity\ConfigEntityDependency;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Site\Settings;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -141,16 +142,11 @@ public function installDefaultConfig($type, $name) {
         $storage = new FileStorage($optional_install_path, StorageInterface::DEFAULT_COLLECTION);
         $this->installOptionalConfig($storage, '');
       }
-      // Install any optional configuration entities whose type this extension
-      // provides. This searches all the installed modules config/optional
+      // Install any optional configuration entities whose dependencies can now
+      // be met. This searches all the installed modules config/optional
       // directories.
-      $provides_config_entity_type = array_reduce($this->configManager->getEntityManager()->getDefinitions(), function ($return, EntityTypeInterface $entity_type) use ($name) {
-        return $return ?: $entity_type->getProvider() && $entity_type->getConfigPrefix();
-      }, FALSE);
-      if ($provides_config_entity_type) {
-        $storage = new ExtensionInstallStorage($this->getActiveStorages(StorageInterface::DEFAULT_COLLECTION), InstallStorage::CONFIG_OPTIONAL_DIRECTORY, StorageInterface::DEFAULT_COLLECTION, FALSE);
-        $this->installOptionalConfig($storage, $name . '.');
-      }
+      $storage = new ExtensionInstallStorage($this->getActiveStorages(StorageInterface::DEFAULT_COLLECTION), InstallStorage::CONFIG_OPTIONAL_DIRECTORY, StorageInterface::DEFAULT_COLLECTION, FALSE);
+      $this->installOptionalConfig($storage, [$type => $name]);
     }
 
     // Reset all the static caches and list caches.
@@ -160,7 +156,7 @@ public function installDefaultConfig($type, $name) {
   /**
    * {@inheritdoc}
    */
-  public function installOptionalConfig(StorageInterface $storage = NULL, $prefix = '') {
+  public function installOptionalConfig(StorageInterface $storage = NULL, $dependency = []) {
     if (!$storage) {
       // Search the install profile's optional configuration too.
       $storage = new ExtensionInstallStorage($this->getActiveStorages(StorageInterface::DEFAULT_COLLECTION), InstallStorage::CONFIG_OPTIONAL_DIRECTORY, StorageInterface::DEFAULT_COLLECTION, TRUE);
@@ -180,19 +176,38 @@ public function installOptionalConfig(StorageInterface $storage = NULL, $prefix
       if (!$this->configManager->supportsConfigurationEntities($collection)) {
         continue;
       }
-      $existing_config = $this->getActiveStorages($collection)->listAll($prefix);
-      $config_to_create = $this->getConfigToCreate($storage, $collection, $prefix, $profile_storage);
-      $all_config = array_merge($existing_config, array_keys($config_to_create));
+      $existing_config = $this->getActiveStorages($collection)->listAll();
+
+      $list = array_filter($storage->listAll(), function($config_name) use ($existing_config) {
+        // Only list configuration that:
+        // - does not already exist
+        // - is a configuration entity (this also excludes config that has an
+        //   implicit dependency on modules that are not yet installed)
+        return !in_array($config_name, $existing_config) && $this->configManager->getEntityTypeIdByName($config_name);
+      });
+
+      $all_config = array_merge($existing_config, $list);
+      $config_to_create = $storage->readMultiple($list);
+      // Check to see if the corresponding override storage has any overrides.
+      if ($profile_storage) {
+        if ($profile_storage->getCollectionName() != $collection) {
+          $profile_storage = $profile_storage->createCollection($collection);
+        }
+        $config_to_create = $profile_storage->readMultiple($list) + $config_to_create;
+      }
       foreach ($config_to_create as $config_name => $data) {
-        // Exclude configuration that:
-        // - already exists
-        // - is a not configuration entity
-        // - or its dependencies cannot be met.
-        if (in_array($config_name, $existing_config) ||
-          !$this->configManager->getEntityTypeIdByName($config_name) ||
-          !$this->validateDependencies($config_name, $data, $enabled_extensions, $all_config)) {
+        // Exclude configuration where its dependencies cannot be met.
+        if (!$this->validateDependencies($config_name, $data, $enabled_extensions, $all_config)) {
           unset($config_to_create[$config_name]);
         }
+        // Exclude configuration that does not have a matching dependency.
+        elseif (!empty($dependency)) {
+          // Create a light weight dependency object to check dependencies.
+          $config_entity = new ConfigEntityDependency($config_name, $data);
+          if (!$config_entity->hasDependency(key($dependency), reset($dependency))) {
+            unset($config_to_create[$config_name]);
+          }
+        }
       }
       if (!empty($config_to_create)) {
         $this->createConfiguration($collection, $config_to_create, TRUE);
@@ -477,12 +492,6 @@ protected function findDefaultConfigWithUnmetDependencies(StorageInterface $stor
    *   TRUE if the dependencies are met, FALSE if not.
    */
   protected function validateDependencies($config_name, array $data, array $enabled_extensions, array $all_config) {
-    // All the migrate tests will fail if we check since they install the
-    // migrate_drupal module but only set up the dependencies for the single
-    // migration they are testing.
-    if (strpos($config_name, 'migrate.migration.') === 0) {
-      return TRUE;
-    }
     if (isset($data['dependencies'])) {
       $all_dependencies = $data['dependencies'];
 
diff --git a/core/lib/Drupal/Core/Config/ConfigInstallerInterface.php b/core/lib/Drupal/Core/Config/ConfigInstallerInterface.php
index 6d8e489..3e99bce 100644
--- a/core/lib/Drupal/Core/Config/ConfigInstallerInterface.php
+++ b/core/lib/Drupal/Core/Config/ConfigInstallerInterface.php
@@ -49,11 +49,13 @@ public function installDefaultConfig($type, $name);
    *   (optional) The configuration storage to search for optional
    *   configuration. If not provided, all enabled extension's optional
    *   configuration directories will be searched.
-   * @param string $prefix
-   *   (optional) If set, limits the installed configuration to only
-   *   configuration beginning with the provided value.
+   * @param array $dependency
+   *   (optional) If set, ensures that the configuration being installed has
+   *   this dependency. The format is dependency type as the key ('module',
+   *   'theme', or 'config') and the dependency name as the value
+   *   ('book', 'bartik', 'views.view.frontpage').
    */
-  public function installOptionalConfig(StorageInterface $storage = NULL, $prefix = '');
+  public function installOptionalConfig(StorageInterface $storage = NULL, $dependency = []);
 
   /**
    * Installs all default configuration in the specified collection.
diff --git a/core/modules/config/src/Tests/ConfigInstallProfileOverrideTest.php b/core/modules/config/src/Tests/ConfigInstallProfileOverrideTest.php
index 3e2c7bf..08e7bec 100644
--- a/core/modules/config/src/Tests/ConfigInstallProfileOverrideTest.php
+++ b/core/modules/config/src/Tests/ConfigInstallProfileOverrideTest.php
@@ -106,15 +106,10 @@ function testInstallProfileConfigOverwrite() {
     // dependency does not get created.
     $this->assertNull($config_test_storage->load('override_unmet'), 'The optional config_test entity with unmet dependencies is not created.');
 
+    // Installing db_log creates the optional configuration.
     $this->container->get('module_installer')->install(['dblog']);
     $this->rebuildContainer();
-    // Just installing db_log does not create the optional configuration.
-    $this->assertNull($config_test_storage->load('override_unmet'), 'The optional config_test entity with unmet dependencies is not created.');
-    // Install all available optional configuration.
-    $this->container->get('config.installer')->installOptionalConfig();
-    $this->assertEqual($config_test_storage->load('override_unmet')->label(), 'Override', 'The optional config_test entity is overridden by the profile optional configuration.');
-
-
+    $this->assertEqual($config_test_storage->load('override_unmet')->label(), 'Override', 'The optional config_test entity is overridden by the profile optional configuration and is installed when its dependencies are met.');
   }
 
 }
diff --git a/core/modules/migrate/src/Entity/Migration.php b/core/modules/migrate/src/Entity/Migration.php
index 9e8fe46..e969992 100644
--- a/core/modules/migrate/src/Entity/Migration.php
+++ b/core/modules/migrate/src/Entity/Migration.php
@@ -480,4 +480,11 @@ public function setTrackLastImported($track_last_imported) {
   public function getMigrationDependencies() {
     return $this->migration_dependencies;
   }
+
+  public function calculateDependencies() {
+    parent::calculateDependencies();
+    $this->calculatePluginDependencies($this->getSourcePlugin());
+    $this->calculatePluginDependencies($this->getDestinationPlugin());
+    return $this->dependencies;
+  }
 }
diff --git a/core/modules/migrate/src/Plugin/Derivative/MigrateEntity.php b/core/modules/migrate/src/Plugin/Derivative/MigrateEntity.php
index 8f4a573..7688472 100644
--- a/core/modules/migrate/src/Plugin/Derivative/MigrateEntity.php
+++ b/core/modules/migrate/src/Plugin/Derivative/MigrateEntity.php
@@ -68,6 +68,7 @@ public function getDerivativeDefinitions($base_plugin_definition) {
         'id' => "entity:$entity_type",
         'class' => $class,
         'requirements_met' => 1,
+        'provider' => $entity_info->getProvider(),
       );
     }
     return $this->derivatives;
diff --git a/core/modules/migrate/src/Plugin/Derivative/MigrateEntityRevision.php b/core/modules/migrate/src/Plugin/Derivative/MigrateEntityRevision.php
index 5c9ae19..51c9830 100644
--- a/core/modules/migrate/src/Plugin/Derivative/MigrateEntityRevision.php
+++ b/core/modules/migrate/src/Plugin/Derivative/MigrateEntityRevision.php
@@ -66,6 +66,7 @@ public function getDerivativeDefinitions($base_plugin_definition) {
           'id' => "entity_revision:$entity_type",
           'class' => 'Drupal\migrate\Plugin\migrate\destination\EntityRevision',
           'requirements_met' => 1,
+          'provider' => $entity_info->getProvider(),
         );
       }
     }
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/Config.php b/core/modules/migrate/src/Plugin/migrate/destination/Config.php
index 7d84813..7884fa3 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/Config.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/Config.php
@@ -104,4 +104,12 @@ public function getIds() {
     return array();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateDependencies() {
+    list($provider,) = explode('.', $this->config->getName(), 2);
+    return ['module' => [$provider]];
+  }
+
 }
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php b/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php
index 084fd88..acf2fc6 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php
@@ -8,6 +8,7 @@
 
 namespace Drupal\migrate\Plugin\migrate\destination;
 
+use Drupal\Component\Plugin\DependentPluginInterface;
 use Drupal\Core\Plugin\PluginBase;
 use Drupal\migrate\Entity\MigrationInterface;
 use Drupal\migrate\Exception\RequirementsException;
@@ -24,7 +25,7 @@
  *
  * @ingroup migration
  */
-abstract class DestinationBase extends PluginBase implements MigrateDestinationInterface, RequirementsInterface {
+abstract class DestinationBase extends PluginBase implements MigrateDestinationInterface, RequirementsInterface, DependentPluginInterface {
 
   /**
    * The migration.
@@ -115,4 +116,11 @@ public function resetStats() {
     // TODO: Implement resetStats() method.
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateDependencies() {
+    return [];
+  }
+
 }
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/Entity.php b/core/modules/migrate/src/Plugin/migrate/destination/Entity.php
index a8bfd6a..9c5a415 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/Entity.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/Entity.php
@@ -169,4 +169,13 @@ protected function getKey($key) {
     return $this->storage->getEntityType()->getKey($key);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateDependencies() {
+    return [
+      'module' => [$this->storage->getEntityType()->getProvider()]
+    ];
+  }
+
 }
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/UserData.php b/core/modules/migrate/src/Plugin/migrate/destination/UserData.php
index eb16ccd..7c51df1 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/UserData.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/UserData.php
@@ -91,4 +91,12 @@ public function fields(MigrationInterface $migration = NULL) {
     ];
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateDependencies() {
+    // @todo somehow add a dependency on the module constant.
+    // $source = $this->migration->getSourcePlugin();
+    return [];
+  }
 }
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_action_settings.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_action_settings.yml
similarity index 87%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_action_settings.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_action_settings.yml
index 5e3cdf7..a771a05 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_action_settings.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_action_settings.yml
@@ -11,3 +11,6 @@ process:
 destination:
   plugin: config
   config_name: action.settings
+dependencies:
+  module:
+    - action
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_aggregator_feed.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_feed.yml
similarity index 89%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_aggregator_feed.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_feed.yml
index bc3b0b1..cab28be 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_aggregator_feed.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_feed.yml
@@ -19,3 +19,7 @@ process:
 
 destination:
   plugin: entity:aggregator_feed
+
+dependencies:
+  module:
+    - aggregator
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_aggregator_item.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_item.yml
similarity index 91%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_aggregator_item.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_item.yml
index 9f2fda5e..14848f6 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_aggregator_item.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_item.yml
@@ -22,3 +22,6 @@ destination:
 migration_dependencies:
   required:
     - d6_aggregator_feed
+dependencies:
+  module:
+    - aggregator
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_aggregator_settings.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_settings.yml
similarity index 94%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_aggregator_settings.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_settings.yml
index 6385366..988a86d 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_aggregator_settings.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_settings.yml
@@ -23,3 +23,6 @@ process:
 destination:
   plugin: config
   config_name: aggregator.settings
+dependencies:
+  module:
+    - aggregator
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_block.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_block.yml
similarity index 98%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_block.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_block.yml
index a7a7481..5f8c65f 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_block.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_block.yml
@@ -91,3 +91,6 @@ migration_dependencies:
     - d6_menu
     - d6_custom_block
     - d6_user_role
+dependencies:
+  module:
+    - block
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_block_content_body_field.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_block_content_body_field.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_block_content_body_field.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_block_content_body_field.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_block_content_type.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_block_content_type.yml
similarity index 89%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_block_content_type.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_block_content_type.yml
index ceaa1a4..9ce9526 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_block_content_type.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_block_content_type.yml
@@ -14,3 +14,6 @@ process:
   label: 'constants/label'
 destination:
   plugin: entity:block_content_type
+dependencies:
+  module:
+    - block_content
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_book.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_book.yml
similarity index 88%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_book.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_book.yml
index d82d68b..7f5e2b7 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_book.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_book.yml
@@ -20,3 +20,7 @@ destination:
 migration_dependencies:
   required:
     - d6_node
+dependencies:
+  module:
+    - book
+    - node
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_book_settings.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_book_settings.yml
similarity index 91%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_book_settings.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_book_settings.yml
index 72ac220..52275e3 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_book_settings.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_book_settings.yml
@@ -15,3 +15,6 @@ process:
 destination:
   plugin: config
   config_name: book.settings
+dependencies:
+  module:
+    - book
\ No newline at end of file
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_cck_field_revision.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_cck_field_revision.yml
similarity index 90%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_cck_field_revision.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_cck_field_revision.yml
index 9340a12..9c911fc 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_cck_field_revision.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_cck_field_revision.yml
@@ -15,3 +15,6 @@ migration_dependencies:
   required:
     - d6_cck_field_values
     - d6_node_revision
+dependencies:
+  module:
+    - node
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_cck_field_values.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_cck_field_values.yml
similarity index 92%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_cck_field_values.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_cck_field_values.yml
index b6d2c8e..55c9976 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_cck_field_values.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_cck_field_values.yml
@@ -19,3 +19,6 @@ migration_dependencies:
     - d6_node
     - d6_field_formatter_settings
     - d6_field_instance_widget_settings
+dependencies:
+  module:
+    - node
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment.yml
similarity index 96%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_comment.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment.yml
index dc38654..fbca6a2 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment.yml
@@ -43,3 +43,6 @@ migration_dependencies:
     - d6_comment_entity_display
     - d6_comment_entity_form_display
     - d6_filter_format
+dependencies:
+  module:
+    - comment
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_entity_display.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_display.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_entity_display.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_display.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_entity_form_display.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_form_display.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_entity_form_display.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_form_display.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_entity_form_display_subject.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_form_display_subject.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_entity_form_display_subject.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_form_display_subject.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_field.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_field.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_field.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_field.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_field_instance.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_field_instance.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_field_instance.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_field_instance.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_type.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_type.yml
similarity index 89%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_type.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_type.yml
index 1b6b470..3287de6 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_type.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_type.yml
@@ -13,3 +13,6 @@ process:
   description: description
 destination:
   plugin: entity:comment_type
+dependencies:
+  module:
+    - comment
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_contact_category.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_contact_category.yml
similarity index 91%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_contact_category.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_contact_category.yml
index 9b04a83..287eefc 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_contact_category.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_contact_category.yml
@@ -20,3 +20,6 @@ process:
   weight: weight
 destination:
   plugin: entity:contact_form
+dependencies:
+  module:
+    - contact
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_contact_settings.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_contact_settings.yml
similarity index 93%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_contact_settings.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_contact_settings.yml
index 91816cb..2d8afa7 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_contact_settings.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_contact_settings.yml
@@ -20,3 +20,6 @@ destination:
 migration_dependencies:
   required:
     - d6_contact_category
+dependencies:
+  module:
+    - contact
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_custom_block.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_custom_block.yml
similarity index 91%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_custom_block.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_custom_block.yml
index 484a2d6..5152935 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_custom_block.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_custom_block.yml
@@ -22,3 +22,6 @@ migration_dependencies:
   required:
     - d6_filter_format
     - d6_block_content_body_field
+dependencies:
+  module:
+    - block_content
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_date_formats.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_date_formats.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_date_formats.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_date_formats.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_dblog_settings.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_dblog_settings.yml
similarity index 87%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_dblog_settings.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_dblog_settings.yml
index 5378866..f7ecfd1 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_dblog_settings.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_dblog_settings.yml
@@ -11,3 +11,6 @@ process:
 destination:
   plugin: config
   config_name: dblog.settings
+dependencies:
+  module:
+    - dblog
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_field.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_field.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_field.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_field_formatter_settings.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_formatter_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_field_formatter_settings.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_formatter_settings.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_field_instance.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_instance.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_field_instance.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_instance.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_field_instance_widget_settings.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_instance_widget_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_field_instance_widget_settings.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_instance_widget_settings.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_file.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_file.yml
similarity index 93%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_file.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_file.yml
index 419680c..e93cde3 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_file.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_file.yml
@@ -22,3 +22,6 @@ process:
   changed: timestamp
 destination:
   plugin: entity:file
+dependencies:
+  module:
+    - file
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_file_settings.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_file_settings.yml
similarity index 92%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_file_settings.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_file_settings.yml
index c9cea38..192f8e8 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_file_settings.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_file_settings.yml
@@ -15,3 +15,6 @@ process:
 destination:
   plugin: config
   config_name: file.settings
+dependencies:
+  module:
+    - file
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_filter_format.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_filter_format.yml
similarity index 96%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_filter_format.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_filter_format.yml
index e70e6c5..6074911 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_filter_format.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_filter_format.yml
@@ -43,3 +43,6 @@ process:
 destination:
   plugin: entity:filter_format
   no_stub: true
+dependencies:
+  module:
+    - filter
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_forum_settings.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_forum_settings.yml
similarity index 95%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_forum_settings.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_forum_settings.yml
index 30d229c..9519db3 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_forum_settings.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_forum_settings.yml
@@ -27,3 +27,6 @@ destination:
 migration_dependencies:
   required:
     - d6_taxonomy_vocabulary
+dependencies:
+  module:
+    - forum
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_locale_settings.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_locale_settings.yml
similarity index 90%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_locale_settings.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_locale_settings.yml
index 4828759..ad1f070 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_locale_settings.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_locale_settings.yml
@@ -13,3 +13,6 @@ process:
 destination:
   plugin: config
   config_name: locale.settings
+dependencies:
+  module:
+    - locale
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_menu.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu.yml
similarity index 83%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_menu.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu.yml
index 0c2e0a2..1ee2c6f 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_menu.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu.yml
@@ -10,3 +10,6 @@ process:
   description: description
 destination:
   plugin: entity:menu
+dependencies:
+  module:
+    - system
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_menu_links.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu_links.yml
similarity index 94%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_menu_links.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu_links.yml
index 0d443a6..37e7b0f 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_menu_links.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu_links.yml
@@ -44,3 +44,6 @@ destination:
 migration_dependencies:
   required:
     - d6_menu
+dependencies:
+  module:
+    - menu_link_content
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_menu_settings.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu_settings.yml
similarity index 92%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_menu_settings.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu_settings.yml
index 9d111bb..e058f06 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_menu_settings.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu_settings.yml
@@ -15,3 +15,6 @@ process:
 destination:
   plugin: config
   config_name: menu_ui.settings
+dependencies:
+  module:
+    - menu_ui
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node.yml
similarity index 97%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_node.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_node.yml
index 80a851c..dd32d3a 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node.yml
@@ -53,3 +53,6 @@ migration_dependencies:
   optional:
     - d6_field_instance_widget_settings
     - d6_field_formatter_settings
+dependencies:
+  module:
+    - node
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_revision.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_revision.yml
similarity index 95%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_node_revision.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_revision.yml
index 848406b..76165b4 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_revision.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_revision.yml
@@ -40,3 +40,6 @@ destination:
 migration_dependencies:
   required:
     - d6_node
+dependencies:
+  module:
+    - node
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_setting_promote.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_promote.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_node_setting_promote.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_promote.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_setting_status.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_status.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_node_setting_status.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_status.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_setting_sticky.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_sticky.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_node_setting_sticky.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_sticky.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_settings.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_settings.yml
similarity index 87%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_node_settings.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_settings.yml
index 83c6386..ed6084a 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_settings.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_settings.yml
@@ -11,3 +11,6 @@ process:
 destination:
   plugin: config
   config_name: node.settings
+dependencies:
+  module:
+    - node
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_type.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_type.yml
similarity index 94%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_node_type.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_type.yml
index a1c5f3c..df454b3 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_type.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_type.yml
@@ -22,3 +22,6 @@ process:
   create_body_label: body_label
 destination:
   plugin: entity:node_type
+dependencies:
+  module:
+    - node
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_profile_values.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_profile_values.yml
similarity index 91%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_profile_values.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_profile_values.yml
index da0395e..da84b74 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_profile_values.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_profile_values.yml
@@ -16,3 +16,6 @@ migration_dependencies:
     - d6_user_profile_field_instance
     - d6_user_profile_entity_display
     - d6_user_profile_entity_form_display
+dependencies:
+  module:
+    - user
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_search_page.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_search_page.yml
similarity index 93%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_search_page.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_search_page.yml
index 0598c45..b5a202d 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_search_page.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_search_page.yml
@@ -23,3 +23,6 @@ process:
     plugin: d6_search_configuration_rankings
 destination:
   plugin: entity:search_page
+dependencies:
+  module:
+    - search
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_search_settings.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_search_settings.yml
similarity index 93%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_search_settings.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_search_settings.yml
index 8a87ef7..6607d42 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_search_settings.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_search_settings.yml
@@ -20,3 +20,6 @@ process:
 destination:
   plugin: config
   config_name: search.settings
+dependencies:
+  module:
+    - search
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_simpletest_settings.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_simpletest_settings.yml
similarity index 93%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_simpletest_settings.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_simpletest_settings.yml
index 1492bf7..38197ed 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_simpletest_settings.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_simpletest_settings.yml
@@ -19,3 +19,6 @@ process:
 destination:
   plugin: config
   config_name: simpletest.settings
+dependencies:
+  module:
+    - simpletest
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_statistics_settings.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_statistics_settings.yml
similarity index 92%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_statistics_settings.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_statistics_settings.yml
index 65e8d89..9febee4 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_statistics_settings.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_statistics_settings.yml
@@ -15,3 +15,6 @@ process:
 destination:
   plugin: config
   config_name: statistics.settings
+dependencies:
+  module:
+    - statistics
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_syslog_settings.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_syslog_settings.yml
similarity index 89%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_syslog_settings.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_syslog_settings.yml
index 0e3ea81..1b63be5 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_syslog_settings.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_syslog_settings.yml
@@ -13,3 +13,6 @@ process:
 destination:
   plugin: config
   config_name: syslog.settings
+dependencies:
+  module:
+    - syslog
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_cron.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_cron.yml
similarity index 90%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_system_cron.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_cron.yml
index 61953b4..151a684 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_cron.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_cron.yml
@@ -14,3 +14,6 @@ process:
 destination:
   plugin: config
   config_name: system.cron
+dependencies:
+  module:
+    - system
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_file.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_file.yml
similarity index 91%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_system_file.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_file.yml
index 3288591..313093a 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_file.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_file.yml
@@ -18,3 +18,6 @@ process:
 destination:
   plugin: config
   config_name: system.file
+dependencies:
+  module:
+    - system
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_filter.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_filter.yml
similarity index 87%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_system_filter.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_filter.yml
index 92e9158..3ec72a2 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_filter.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_filter.yml
@@ -11,3 +11,6 @@ process:
 destination:
   plugin: config
   config_name: system.filter
+dependencies:
+  module:
+    - system
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_image.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_image.yml
similarity index 86%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_system_image.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_image.yml
index 32647f6..ecd9be7 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_image.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_image.yml
@@ -11,3 +11,6 @@ process:
 destination:
   plugin: config
   config_name: system.image
+dependencies:
+  module:
+    - system
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_image_gd.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_image_gd.yml
similarity index 87%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_system_image_gd.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_image_gd.yml
index 4b2c8e4..c5756ca 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_image_gd.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_image_gd.yml
@@ -11,3 +11,6 @@ process:
 destination:
   plugin: config
   config_name: system.image.gd
+dependencies:
+  module:
+    - system
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_logging.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_logging.yml
similarity index 90%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_system_logging.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_logging.yml
index b4464ac..107ba3d 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_logging.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_logging.yml
@@ -19,3 +19,6 @@ process:
 destination:
   plugin: config
   config_name: system.logging
+dependencies:
+  module:
+    - system
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_maintenance.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_maintenance.yml
similarity index 88%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_system_maintenance.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_maintenance.yml
index e452989..7c225cd 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_maintenance.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_maintenance.yml
@@ -11,3 +11,6 @@ process:
 destination:
   plugin: config
   config_name: system.maintenance
+dependencies:
+  module:
+    - system
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_performance.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_performance.yml
similarity index 92%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_system_performance.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_performance.yml
index 2b6f478..e1ed708 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_performance.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_performance.yml
@@ -19,3 +19,6 @@ process:
 destination:
   plugin: config
   config_name: system.performance
+dependencies:
+  module:
+    - system
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_rss.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_rss.yml
similarity index 89%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_system_rss.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_rss.yml
index 36b3bff..7783cc2 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_rss.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_rss.yml
@@ -13,3 +13,6 @@ process:
 destination:
   plugin: config
   config_name: system.rss
+dependencies:
+  module:
+    - system
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_site.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_site.yml
similarity index 93%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_system_site.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_site.yml
index a05fc3d..99671d2 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_site.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_site.yml
@@ -25,3 +25,6 @@ process:
 destination:
   plugin: config
   config_name: system.site
+dependencies:
+  module:
+    - system
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_taxonomy_settings.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_settings.yml
similarity index 90%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_taxonomy_settings.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_settings.yml
index f33c97b..c7f9981 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_taxonomy_settings.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_settings.yml
@@ -13,3 +13,6 @@ process:
 destination:
   plugin: config
   config_name: taxonomy.settings
+dependencies:
+  module:
+    - taxonomy
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_taxonomy_term.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_term.yml
similarity index 93%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_taxonomy_term.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_term.yml
index 11ac6b8..788bffa 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_taxonomy_term.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_term.yml
@@ -26,3 +26,6 @@ destination:
 migration_dependencies:
   required:
     - d6_taxonomy_vocabulary
+dependencies:
+  module:
+    - taxonomy
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_taxonomy_vocabulary.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_vocabulary.yml
similarity index 92%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_taxonomy_vocabulary.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_vocabulary.yml
index 2334aa9..f608559 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_taxonomy_vocabulary.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_vocabulary.yml
@@ -21,3 +21,6 @@ process:
   weight: weight
 destination:
   plugin: entity:taxonomy_vocabulary
+dependencies:
+  module:
+    - taxonomy
\ No newline at end of file
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_term_node.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_term_node.yml
similarity index 92%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_term_node.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_term_node.yml
index cb82cb3..3eaf767 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_term_node.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_term_node.yml
@@ -20,3 +20,6 @@ migration_dependencies:
     - d6_vocabulary_entity_display
     - d6_vocabulary_entity_form_display
     - d6_node
+dependencies:
+  module:
+    - node
\ No newline at end of file
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_term_node_revision.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_term_node_revision.yml
similarity index 92%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_term_node_revision.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_term_node_revision.yml
index 706a8bb..97d48d9 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_term_node_revision.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_term_node_revision.yml
@@ -20,3 +20,6 @@ migration_dependencies:
   required:
     - d6_term_node
     - d6_node_revision
+dependencies:
+  module:
+    - node
\ No newline at end of file
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_text_settings.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_text_settings.yml
similarity index 88%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_text_settings.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_text_settings.yml
index 93b8e07..73bd102 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_text_settings.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_text_settings.yml
@@ -11,3 +11,6 @@ process:
 destination:
   plugin: config
   config_name: text.settings
+dependencies:
+  module:
+    - text
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_update_settings.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_update_settings.yml
similarity index 94%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_update_settings.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_update_settings.yml
index f79d4dc..8ce0cf0 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_update_settings.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_update_settings.yml
@@ -19,3 +19,6 @@ process:
 destination:
   plugin: config
   config_name: update.settings
+dependencies:
+  module:
+    - update
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload.yml
similarity index 92%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_upload.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload.yml
index 607455d..dfdc5b9 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload.yml
@@ -25,3 +25,6 @@ migration_dependencies:
   required:
     - d6_file
     - d6_node
+dependencies:
+  module:
+    - node
\ No newline at end of file
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_entity_display.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_entity_display.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_entity_display.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_entity_display.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_entity_form_display.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_entity_form_display.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_entity_form_display.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_entity_form_display.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_field.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_field.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_field.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_field.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_field_instance.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_field_instance.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_field_instance.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_field_instance.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_url_alias.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_url_alias.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_url_alias.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_url_alias.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user.yml
similarity index 95%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_user.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_user.yml
index 99302ec..3f25c20 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user.yml
@@ -35,3 +35,6 @@ migration_dependencies:
     - d6_user_picture_file
     - d6_user_picture_entity_display
     - d6_user_picture_entity_form_display
+dependencies:
+  module:
+    - user
\ No newline at end of file
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_contact_settings.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_contact_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_user_contact_settings.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_contact_settings.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_mail.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_mail.yml
similarity index 98%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_user_mail.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_mail.yml
index 3b21970..ad7009d 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_mail.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_mail.yml
@@ -37,3 +37,6 @@ process:
 destination:
   plugin: config
   config_name: user.mail
+dependencies:
+  module:
+    - user
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_entity_display.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_entity_display.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_entity_display.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_entity_display.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_entity_form_display.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_entity_form_display.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_entity_form_display.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_entity_form_display.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_field.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_field.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_field.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_field.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_field_instance.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_field_instance.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_field_instance.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_field_instance.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_file.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_file.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_file.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_file.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_entity_display.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_entity_display.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_entity_display.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_entity_display.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_entity_form_display.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_entity_form_display.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_entity_form_display.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_entity_form_display.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_field.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_field.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_field.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_field.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_field_instance.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_field_instance.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_field_instance.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_field_instance.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_role.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_role.yml
similarity index 97%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_user_role.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_role.yml
index f899c8a..60130dd 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_role.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_role.yml
@@ -41,3 +41,6 @@ process:
     - plugin: filter_format_permission
 destination:
   plugin: entity:user_role
+dependencies:
+  module:
+    - user
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_settings.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_settings.yml
similarity index 95%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_user_settings.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_settings.yml
index 274288b..09e88ac 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_settings.yml
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_settings.yml
@@ -26,3 +26,6 @@ process:
 destination:
   plugin: config
   config_name: user.settings
+dependencies:
+  module:
+    - user
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_view_modes.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_view_modes.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_view_modes.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_view_modes.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_entity_display.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_entity_display.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_entity_display.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_entity_display.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_entity_form_display.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_entity_form_display.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_entity_form_display.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_entity_form_display.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_field.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_field.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_field.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_field.yml
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_field_instance.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_field_instance.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_field_instance.yml
rename to core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_field_instance.yml