diff --git a/core/modules/forum/config/install/core.entity_form_display.taxonomy_term.forums.default.yml b/core/modules/forum/config/install/core.entity_form_display.taxonomy_term.forums.default.yml
index d5a17c0..5542b66 100644
--- a/core/modules/forum/config/install/core.entity_form_display.taxonomy_term.forums.default.yml
+++ b/core/modules/forum/config/install/core.entity_form_display.taxonomy_term.forums.default.yml
@@ -19,7 +19,7 @@ content:
     third_party_settings: {  }
   forum_description:
     type: text_textarea
-    weight: 1
+    weight: 0
     settings:
       rows: 5
       placeholder: ''
diff --git a/core/modules/forum/config/install/field.storage.taxonomy_term.forum_description.yml b/core/modules/forum/config/install/field.storage.taxonomy_term.forum_description.yml
index 4aa3141..84b2177 100644
--- a/core/modules/forum/config/install/field.storage.taxonomy_term.forum_description.yml
+++ b/core/modules/forum/config/install/field.storage.taxonomy_term.forum_description.yml
@@ -14,4 +14,4 @@ locked: false
 cardinality: 1
 translatable: true
 indexes: {  }
-persist_with_no_fields: false
+persist_with_no_fields: true
diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index f7dbfd7..d3eb932 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -7,7 +7,6 @@
 
 use Drupal\comment\CommentInterface;
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
-use Drupal\Component\Utility\Xss;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Url;
 use Drupal\Component\Utility\String;
diff --git a/core/modules/forum/src/Tests/ForumTest.php b/core/modules/forum/src/Tests/ForumTest.php
index 4c1b8df..b7bc6db 100644
--- a/core/modules/forum/src/Tests/ForumTest.php
+++ b/core/modules/forum/src/Tests/ForumTest.php
@@ -10,6 +10,7 @@
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Link;
 use Drupal\simpletest\WebTestBase;
+use Drupal\taxonomy\Entity\Term;
 use Drupal\taxonomy\Entity\Vocabulary;
 
 /**
@@ -398,7 +399,7 @@ function createForum($type, $parent = 0) {
     $this->assertTrue(!empty($tid), 'The ' . $type . ' exists in the database');
 
     // Verify forum hierarchy.
-    $term = entity_load('taxonomy_term', $tid);
+    $term = Term::load($tid);
     $parent_tid = db_query("SELECT t.parent FROM {taxonomy_term_hierarchy} t WHERE t.tid = :tid", array(':tid' => $tid))->fetchField();
     $this->assertTrue($parent == $parent_tid, 'The ' . $type . ' is linked to its container');