diff -u b/core/modules/comment/src/Plugin/migrate/destination/EntityComment.php b/core/modules/comment/src/Plugin/migrate/destination/EntityComment.php
--- b/core/modules/comment/src/Plugin/migrate/destination/EntityComment.php
+++ b/core/modules/comment/src/Plugin/migrate/destination/EntityComment.php
@@ -34,13 +34,6 @@
   protected $stubCommentedEntityIds;
 
   /**
-   * The language manager.
-   *
-   * @var \Drupal\Core\Language\LanguageManagerInterface
-   */
-  protected $languageManager;
-
-  /**
    * Builds an comment entity destination.
    *
    * @param array $configuration
@@ -64,11 +57,9 @@
    * @param \Drupal\Core\State\StateInterface $state
    *   The state storage object.
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, EntityStorageInterface $storage, array $bundles, LanguageManagerInterface $language_manager, EntityManagerInterface $entity_manager, FieldTypePluginManagerInterface $field_type_manager, StateInterface $state, QueryFactory $entity_query) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, EntityStorageInterface $storage, array $bundles, LanguageManagerInterface $language_manager, EntityManagerInterface $entity_manager, FieldTypePluginManagerInterface $field_type_manager, StateInterface $state) {
     parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $storage, $bundles, $language_manager, $entity_manager, $field_type_manager);
     $this->state = $state;
-    $this->entityQuery = $entity_query;
-    $this->languageManager = $language_manager;
   }
 
   /**
diff -u b/core/modules/config_translation/migration_templates/d6_i18n_block.yml b/core/modules/config_translation/migration_templates/d6_i18n_block.yml
--- b/core/modules/config_translation/migration_templates/d6_i18n_block.yml
+++ b/core/modules/config_translation/migration_templates/d6_i18n_block.yml
@@ -69,2 +68,0 @@
-
-
diff -u b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nBlockTest.php b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nBlockTest.php
--- b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nBlockTest.php
+++ b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nBlockTest.php
@@ -21,7 +21,6 @@
     'menu_ui',
     'block_content',
     'config_translation',
-    'locale',
     'language',
   ];
 
diff -u b/core/modules/content_translation/src/Plugin/migrate/source/d6/I18nBox.php b/core/modules/content_translation/src/Plugin/migrate/source/d6/I18nBox.php
--- b/core/modules/content_translation/src/Plugin/migrate/source/d6/I18nBox.php
+++ b/core/modules/content_translation/src/Plugin/migrate/source/d6/I18nBox.php
@@ -5,7 +5,7 @@
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
 /**
- * Gets Drupal 6 i18n block body translation from database.
+ * Gets Drupal 6 i18n custom block translations from database.
  *
  * @MigrateSource(
  *   id = "d6_i18n_box"
diff -u b/core/modules/content_translation/tests/src/Kernel/Migrate/d6/MigrateI18nBlockContentTest.php b/core/modules/content_translation/tests/src/Kernel/Migrate/d6/MigrateI18nBlockContentTest.php
--- b/core/modules/content_translation/tests/src/Kernel/Migrate/d6/MigrateI18nBlockContentTest.php
+++ b/core/modules/content_translation/tests/src/Kernel/Migrate/d6/MigrateI18nBlockContentTest.php
@@ -21,7 +21,6 @@
     'block_content',
     'config_translation',
     'content_translation',
-    'locale',
     'language',
   ];
 
diff -u b/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php b/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
--- b/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
@@ -298,8 +298,8 @@
     $field_definition = $definitions[$key];
 
     return [
-      'type' => $field_definition->getType(),
-    ] + $field_definition->getSettings();
+        'type' => $field_definition->getType(),
+      ] + $field_definition->getSettings();
   }
 
 }
diff -u b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
--- b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
+++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
@@ -87,7 +87,7 @@
       'destination_module' => 'block_content',
     ],
     'd6_i18n_custom_block' => [
-      'source_module' => 'translation',
+      'source_module' => 'i18n',
       'destination_module' => 'content_translation',
     ],
     'd7_custom_block' => [