diff --git a/src/System Application/App/Upgrade Tags/app.json b/src/System Application/App/Upgrade Tags/app.json
index 035fb8c9ad..9e7371d3ca 100644
--- a/src/System Application/App/Upgrade Tags/app.json	
+++ b/src/System Application/App/Upgrade Tags/app.json	
@@ -14,6 +14,10 @@
   "screenshots": [],
   "platform": "25.2.0.0",
   "idRanges": [
+    {
+      "from": 9985,
+      "to": 9985
+    },
     {
       "from": 9992,
       "to": 9994
diff --git a/src/System Application/App/Upgrade Tags/src/UpgradeTags.Page.al b/src/System Application/App/Upgrade Tags/src/UpgradeTags.Page.al
new file mode 100644
index 0000000000..96113cff76
--- /dev/null
+++ b/src/System Application/App/Upgrade Tags/src/UpgradeTags.Page.al	
@@ -0,0 +1,34 @@
+// ------------------------------------------------------------------------------------------------
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// ------------------------------------------------------------------------------------------------
+
+namespace System.Upgrade;
+page 9985 "Upgrade Tags"
+{
+    PageType = List;
+    ApplicationArea = All;
+    Caption = 'Upgrade Tags';
+    Extensible = false;
+    UsageCategory = Lists;
+    SourceTable = "Upgrade Tags";
+    InsertAllowed = false;
+    DeleteAllowed = false;
+    ModifyAllowed = false;
+    InherentEntitlements = X;
+    InherentPermissions = X;
+
+    layout
+    {
+        area(Content)
+        {
+            repeater(GroupName)
+            {
+                field(Tag; Rec.Tag) { }
+                field("Tag Timestamp"; Rec."Tag Timestamp") { }
+                field(Company; Rec.Company) { }
+                field("Skipped Upgrade"; Rec."Skipped Upgrade") { }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/System Application/App/Upgrade Tags/src/UpgradeTags.Table.al b/src/System Application/App/Upgrade Tags/src/UpgradeTags.Table.al
index 890273a693..b15acb9301 100644
--- a/src/System Application/App/Upgrade Tags/src/UpgradeTags.Table.al	
+++ b/src/System Application/App/Upgrade Tags/src/UpgradeTags.Table.al	
@@ -20,22 +20,26 @@ table 9999 "Upgrade Tags"
         {
             Caption = 'Tag';
             DataClassification = SystemMetadata;
+            ToolTip = 'Specifies the tag that is used to identify the upgrade.';
         }
         field(2; "Tag Timestamp"; DateTime)
         {
             Caption = 'Tag Timestamp';
             DataClassification = SystemMetadata;
+            ToolTip = 'Specifies the date and time when the upgrade is executed.';
         }
         field(3; Company; Code[30])
         {
             Caption = 'Company';
             DataClassification = SystemMetadata;
+            ToolTip = 'Specifies the company where the upgrade is executed.';
         }
 
         field(4; "Skipped Upgrade"; Boolean)
         {
             Caption = 'Skipped Upgrade';
             DataClassification = SystemMetadata;
+            ToolTip = 'Specifies whether the upgrade is skipped.';
         }
     }
 
diff --git a/src/System Application/App/Word Templates/src/WordTemplatesRelatedList.Page.al b/src/System Application/App/Word Templates/src/WordTemplatesRelatedList.Page.al
deleted file mode 100644
index 14182112eb..0000000000
--- a/src/System Application/App/Word Templates/src/WordTemplatesRelatedList.Page.al	
+++ /dev/null
@@ -1,82 +0,0 @@
-#if not CLEAN22
-// ------------------------------------------------------------------------------------------------
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-// ------------------------------------------------------------------------------------------------
-
-namespace System.Integration.Word;
-
-/// <summary>
-/// A list page to view and edit related entities for Word templates.
-/// </summary>
-page 9985 "Word Templates Related List"
-{
-    Caption = 'Related Entities';
-    PageType = List;
-    SourceTable = "Word Templates Related Table";
-    InsertAllowed = false;
-    Permissions = tabledata "Word Templates Related Table" = rimd;
-    Extensible = false;
-    ObsoleteState = Pending;
-    ObsoleteTag = '22.0';
-    ObsoleteReason = 'No longer used. Use page 9987 Word Templates Related Part instead.';
-    InherentEntitlements = X;
-    InherentPermissions = X;
-
-    layout
-    {
-        area(Content)
-        {
-            repeater(Tables)
-            {
-                field("Table ID"; Rec."Related Table ID")
-                {
-                    ApplicationArea = All;
-                    ToolTip = 'Specifies the id of the related entity.';
-                    Visible = false;
-                }
-                field("Table Caption"; Rec."Related Table Caption")
-                {
-                    ApplicationArea = All;
-                    Caption = 'Name';
-                    ToolTip = 'Specifies the related entity.';
-                    Editable = false;
-
-                    trigger OnAssistEdit()
-                    var
-                        WordTemplateImpl: Codeunit "Word Template Impl.";
-                    begin
-                        WordTemplateImpl.UpdateRelatedEntity(Rec, TableId);
-                    end;
-                }
-                field("Related Table Code"; Rec."Related Table Code")
-                {
-                    ApplicationArea = All;
-                    Caption = 'Field Prefix';
-                    ToolTip = 'Specifies a prefix that will indicate that the field is from the related entity when you are setting up the template. For example, if you enter SALES, the field names are prefixed with SALES_. The prefix must be unique.';
-                }
-            }
-        }
-    }
-
-    trigger OnNewRecord(BelowxRec: Boolean)
-    begin
-        Rec."Table ID" := TableId;
-    end;
-
-    internal procedure AddTable(WordTemplatesRelatedTable: Record "Word Templates Related Table"): Boolean
-    var
-        WordTemplateImpl: Codeunit "Word Template Impl.";
-    begin
-        exit(WordTemplateImpl.AddRelatedTable(Rec, WordTemplatesRelatedTable));
-    end;
-
-    internal procedure SetTableNo(TableNo: Integer)
-    begin
-        TableId := TableNo;
-    end;
-
-    var
-        TableId: Integer;
-}
-#endif
\ No newline at end of file