diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index b0a0ab2f2..000000000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Code of Conduct
-
-The code of conduct for this project can be found at https://swift.org/code-of-conduct.
-
-<!-- Copyright (c) 2021 Apple Inc and the Swift Project authors. All Rights Reserved. -->
diff --git a/src/App.vue b/src/App.vue
index 1115d50a4..742765f74 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -14,7 +14,9 @@
     :class="{ fromkeyboard: fromKeyboard, hascustomheader: hasCustomHeader }"
   >
     <div :id="AppTopID" />
-    <a href="#main" id="skip-nav" v-if="!isTargetIDE">{{ $t('accessibility.skip-navigation') }}</a>
+    <a href="#app-main" id="skip-nav" v-if="!isTargetIDE">
+      {{ $t('accessibility.skip-navigation') }}
+    </a>
     <slot name="header" :isTargetIDE="isTargetIDE">
       <SuggestLang v-if="enablei18n" />
       <!-- Render the custom header by default, if there is no content in the `header` slot -->
diff --git a/src/components/Article.vue b/src/components/Article.vue
index ff8894798..f95bbc71e 100644
--- a/src/components/Article.vue
+++ b/src/components/Article.vue
@@ -18,7 +18,7 @@
       :rootReference="hierarchy.reference"
       :identifierUrl="identifierUrl"
     />
-    <main id="main" tabindex="0">
+    <main id="app-main" tabindex="0">
       <slot name="above-hero" />
       <component
         v-for="(section, index) in sections"
diff --git a/src/components/Card.vue b/src/components/Card.vue
index 863c17a01..bccc32963 100644
--- a/src/components/Card.vue
+++ b/src/components/Card.vue
@@ -180,11 +180,9 @@ export default {
     border-radius: $big-border-radius;
 
     &:hover {
-      box-shadow: 0 5px 10px var(--color-card-shadow);
       transform: scale(1.007);
 
       @media (prefers-reduced-motion: reduce) {
-        box-shadow: none;
         transform: none;
       }
     }
diff --git a/src/components/ContentNode.vue b/src/components/ContentNode.vue
index fd9bab5a4..ff8fd5175 100644
--- a/src/components/ContentNode.vue
+++ b/src/components/ContentNode.vue
@@ -673,13 +673,21 @@ export default {
     // without any inline formatting—other block kinds like asides will be
     // ignored in the resulting plaintext representation.
     plaintext() {
+      const { references = {} } = this;
       return this.reduce((text, node) => {
         if (node.type === BlockType.paragraph) {
           return `${text}\n`;
         }
+        if (node.type === InlineType.codeVoice) {
+          return `${text}${node.code}`;
+        }
         if (node.type === InlineType.text) {
           return `${text}${node.text}`;
         }
+        if (node.type === InlineType.reference) {
+          const title = references[node.identifier]?.title ?? '';
+          return `${text}${title}`;
+        }
         return text;
       }, '').trim();
     },
diff --git a/src/components/ContentNode/Reference.vue b/src/components/ContentNode/Reference.vue
index 8d275ce5c..d9dbe19ae 100644
--- a/src/components/ContentNode/Reference.vue
+++ b/src/components/ContentNode/Reference.vue
@@ -54,6 +54,9 @@ export default {
   name: 'Reference',
   computed: {
     isInternal({ url }) {
+      if (!url) {
+        return false;
+      }
       if (!url.startsWith('/') && !url.startsWith('#')) {
         // If the URL has a scheme, it's not an internal link.
         return false;
@@ -92,7 +95,7 @@ export default {
   props: {
     url: {
       type: String,
-      required: true,
+      required: false,
     },
     kind: {
       type: String,
diff --git a/src/components/ContentNode/ReferenceExternal.vue b/src/components/ContentNode/ReferenceExternal.vue
index f24e4b42f..732e180d7 100644
--- a/src/components/ContentNode/ReferenceExternal.vue
+++ b/src/components/ContentNode/ReferenceExternal.vue
@@ -9,7 +9,7 @@
 -->
 
 <template>
-  <a v-if="isActive" :href="url"><slot /></a>
+  <a v-if="url && isActive" :href="url"><slot /></a>
   <span v-else><slot /></span>
 </template>
 
@@ -19,7 +19,7 @@ export default {
   props: {
     url: {
       type: String,
-      required: true,
+      required: false,
     },
     isActive: {
       type: Boolean,
diff --git a/src/components/ContentNode/ReferenceInternal.vue b/src/components/ContentNode/ReferenceInternal.vue
index bf55aee85..955119eeb 100644
--- a/src/components/ContentNode/ReferenceInternal.vue
+++ b/src/components/ContentNode/ReferenceInternal.vue
@@ -9,7 +9,7 @@
 -->
 
 <template>
-  <router-link v-if="isActive" :to="url"><slot /></router-link>
+  <router-link v-if="url && isActive" :to="url"><slot /></router-link>
   <span v-else><slot/></span>
 </template>
 
@@ -19,7 +19,7 @@ export default {
   props: {
     url: {
       type: String,
-      required: true,
+      required: false,
     },
     isActive: {
       type: Boolean,
diff --git a/src/components/DocumentationLayout.vue b/src/components/DocumentationLayout.vue
index a24a770f0..f53dfe20c 100644
--- a/src/components/DocumentationLayout.vue
+++ b/src/components/DocumentationLayout.vue
@@ -19,8 +19,8 @@
       :displaySidenav="enableNavigator"
       @toggle-sidenav="handleToggleSidenav"
     >
-      <template #title>
-        <slot name="nav-title" />
+      <template #title="{ className }">
+        <slot name="nav-title" :className="className" />
       </template>
     </Nav>
     <AdjustableSidebarWidth
@@ -62,8 +62,8 @@
                   <template v-if="enableQuickNavigation" #filter>
                     <QuickNavigationButton @click.native="openQuickNavigationModal" />
                   </template>
-                  <template #navigator-head>
-                    <slot name="nav-title" />
+                  <template #navigator-head="{ className }">
+                    <slot name="nav-title" :className="className" />
                   </template>
                 </Navigator>
               </transition>
diff --git a/src/components/DocumentationTopic.vue b/src/components/DocumentationTopic.vue
index e5ca984fb..6a20c295e 100644
--- a/src/components/DocumentationTopic.vue
+++ b/src/components/DocumentationTopic.vue
@@ -15,7 +15,7 @@
   >
     <component
       :is="isTargetIDE ? 'div' : 'main'"
-      class="main" id="main"
+      class="main" id="app-main"
     >
       <DocumentationHero
         :role="role"
@@ -129,7 +129,6 @@
               :source="remoteSource"
               :sections="primaryContentSectionsSanitized"
             />
-            <ViewMore v-if="shouldShowViewMoreLink" :url="viewMoreLink" />
           </div>
           <Topics
             v-if="shouldRenderTopicSection"
@@ -145,8 +144,9 @@
             :isSymbolBeta="isSymbolBeta"
           />
           <Relationships
-            v-if="relationshipsSections && !enableMinimized"
+            v-if="relationshipsSections"
             :sections="relationshipsSections"
+            :enableMinimized="enableMinimized"
           />
           <!-- NOTE: see also may contain information about other apis, so we cannot
           pass deprecation and beta information -->
@@ -154,6 +154,11 @@
             v-if="seeAlsoSections && !enableMinimized"
             :sections="seeAlsoSections"
           />
+          <ViewMore
+            v-if="shouldShowViewMoreLink"
+            :url="viewMoreLink"
+            class="minimized-container"
+          />
         </div>
         <template v-if="enableOnThisPageNav">
           <OnThisPageStickyContainer v-show="isOnThisPageNavVisible">
@@ -778,7 +783,7 @@ $space-size: 15px;
   }
 }
 
-#main {
+#app-main {
   outline-style: none;
   height: 100%;
 
@@ -831,6 +836,11 @@ $space-size: 15px;
     --aside-border-radius: 6px;
     --code-border-radius: 6px;
 
+    &:not(.declarations-container) {
+      padding-left: 1.4rem;
+      padding-right: 1.4rem;
+    }
+
     .description {
       margin-bottom: 1.5em;
     }
@@ -904,11 +914,6 @@ $space-size: 15px;
   }
 }
 
-.full-width-container .doc-content .minimized-container {
-  padding-left: 1.4rem;
-  padding-right: 1.4rem;
-}
-
 :deep() {
   .no-primary-content {
     // remove border-top for first section of the page
@@ -952,7 +957,7 @@ $space-size: 15px;
     min-width: 0;
     width: 100%;
 
-    // only render border on declaration list menu
+    // only render border and bottom margin on declaration list menu
     // when there are no content sections afterwards at all
     .container:only-child {
       .declaration-list-menu:last-child::before {
@@ -961,6 +966,7 @@ $space-size: 15px;
         border-top-width: var(--content-table-title-border-width, 1px);
         content: '';
         display: block;
+        margin-bottom: $section-spacing-single-side;
       }
     }
 
diff --git a/src/components/DocumentationTopic/ContentTable.vue b/src/components/DocumentationTopic/ContentTable.vue
index bdc1fa685..79e604c2a 100644
--- a/src/components/DocumentationTopic/ContentTable.vue
+++ b/src/components/DocumentationTopic/ContentTable.vue
@@ -1,7 +1,7 @@
 <!--
   This source file is part of the Swift.org open source project
 
-  Copyright (c) 2021-2022 Apple Inc. and the Swift project authors
+  Copyright (c) 2021-2024 Apple Inc. and the Swift project authors
   Licensed under Apache License v2.0 with Runtime Library Exception
 
   See https://swift.org/LICENSE.txt for license information
@@ -10,7 +10,7 @@
 
 <template>
   <section class="contenttable alt-light">
-    <div class="container">
+    <div :class="['container', { 'minimized-container': enableMinimized }]">
       <LinkableHeading class="title" :anchor="anchor">{{ title }}</LinkableHeading>
       <slot />
     </div>
@@ -32,6 +32,10 @@ export default {
       type: String,
       required: true,
     },
+    enableMinimized: {
+      type: Boolean,
+      default: false,
+    },
   },
 };
 </script>
@@ -39,14 +43,25 @@ export default {
 <style scoped lang="scss">
 @import 'docc-render/styles/_core.scss';
 
-.container {
+.container:not(.minimized-container) {
   @include dynamic-content-container;
-  padding-bottom: $section-spacing-single-side;
+}
+
+.container {
+  --section-spacing-single-side: #{$section-spacing-single-side};
+  &.minimized-container {
+    --section-spacing-single-side: 1.5em;
+
+    .contenttable-section {
+      padding-top: var(--section-spacing-single-side);
+    }
+  }
+  padding-bottom: var(--section-spacing-single-side);
 }
 
 .title {
   @include font-styles(heading-2-reduced);
-  padding-top: $section-spacing-single-side;
+  padding-top: var(--section-spacing-single-side);
   border-top-color: var(--color-grid);
   border-top-style: solid;
   border-top-width: var(--content-table-title-border-width, 1px);
diff --git a/src/components/DocumentationTopic/DocumentationNav.vue b/src/components/DocumentationTopic/DocumentationNav.vue
index 81c2efde1..f32807821 100644
--- a/src/components/DocumentationTopic/DocumentationNav.vue
+++ b/src/components/DocumentationTopic/DocumentationNav.vue
@@ -38,7 +38,7 @@
       </div>
     </template>
     <template #default>
-      <slot name="title" />
+      <slot name="title" className="nav-title" />
     </template>
     <template #tray="{ closeNav }">
       <NavMenuItems
@@ -194,10 +194,7 @@ $sidenav-icon-padding-size: 5px;
 .sidenav-toggle-wrapper {
   display: flex;
   margin-top: 1px;
-
-  @include breakpoints-from(large, nav) {
-    margin-right: $nav-padding / 2;
-  }
+  margin-right: $nav-padding / 2;
 
   // This is a hack to enforce the toggle to be visible when in breakpoint,
   // even if already toggled off on desktop. Conditionally checking the current breakpoint,
diff --git a/src/components/DocumentationTopic/PrimaryContent/Declaration.vue b/src/components/DocumentationTopic/PrimaryContent/Declaration.vue
index 0b1ae4898..27283c1a1 100644
--- a/src/components/DocumentationTopic/PrimaryContent/Declaration.vue
+++ b/src/components/DocumentationTopic/PrimaryContent/Declaration.vue
@@ -1,7 +1,7 @@
 <!--
   This source file is part of the Swift.org open source project
 
-  Copyright (c) 2021-2023 Apple Inc. and the Swift project authors
+  Copyright (c) 2021-2024 Apple Inc. and the Swift project authors
   Licensed under Apache License v2.0 with Runtime Library Exception
 
   See https://swift.org/LICENSE.txt for license information
@@ -20,7 +20,6 @@
     <template v-else>
       <DeclarationList
         v-for="(declaration, i) in declarations"
-        :class="changeClasses"
         :key="i"
         :declaration="declaration"
         :shouldCaption="hasPlatformVariants"
@@ -54,6 +53,7 @@ import DeclarationSourceLink
 
 import { ChangeTypes } from 'docc-render/constants/Changes';
 import { multipleLinesClass } from 'docc-render/constants/multipleLines';
+import { isEqual } from 'docc-render/utils/arrays';
 
 export default {
   name: 'Declaration',
@@ -90,12 +90,13 @@ export default {
   computed: {
     /**
      * Show the captions of DeclarationGroup without changes
-     * when there are more than one declarations
+     * when there are multiple sets of platforms among the
+     * declarations.
      * @returns {boolean}
      */
-    hasPlatformVariants() {
-      return this.declarations.length > 1;
-    },
+    hasPlatformVariants: ({ declarations }) => !(declarations.every(
+      ({ platforms }) => isEqual(platforms, declarations[0].platforms),
+    )),
     /**
      * Returns whether there are declaration changes.
      * @returns {boolean}
@@ -154,4 +155,8 @@ export default {
 .conditional-constraints {
   margin-top: var(--declaration-conditional-constraints-margin, 20px);
 }
+
+.declaration-list:not(:first-child) {
+  margin-top: var(--declaration-conditional-constraints-margin, 20px);
+}
 </style>
diff --git a/src/components/DocumentationTopic/PrimaryContent/DeclarationDiff.vue b/src/components/DocumentationTopic/PrimaryContent/DeclarationDiff.vue
index e333ac2a8..43b35db78 100644
--- a/src/components/DocumentationTopic/PrimaryContent/DeclarationDiff.vue
+++ b/src/components/DocumentationTopic/PrimaryContent/DeclarationDiff.vue
@@ -17,7 +17,6 @@
         :key="i"
         :declaration="declaration"
         :should-caption="currentDeclarations.length > 1"
-        :changeType="changeType"
       />
     </div>
     <div class="declaration-diff-previous">
@@ -27,7 +26,6 @@
         :key="i"
         :declaration="declaration"
         :should-caption="previousDeclarations.length > 1"
-        :changeType="changeType"
       />
     </div>
   </div>
@@ -50,14 +48,6 @@ export default {
       type: Object,
       required: true,
     },
-    /**
-     * The applied change type to the diff.
-     * @type {"added"|"deprecated"|"modified"}
-     */
-    changeType: {
-      type: String,
-      required: true,
-    },
   },
   computed: {
     previousDeclarations: ({ changes }) => changes.declaration.previous || [],
diff --git a/src/components/DocumentationTopic/PrimaryContent/DeclarationGroup.vue b/src/components/DocumentationTopic/PrimaryContent/DeclarationGroup.vue
new file mode 100644
index 000000000..4cdc7be77
--- /dev/null
+++ b/src/components/DocumentationTopic/PrimaryContent/DeclarationGroup.vue
@@ -0,0 +1,164 @@
+<!--
+  This source file is part of the Swift.org open source project
+
+  Copyright (c) 2024 Apple Inc. and the Swift project authors
+  Licensed under Apache License v2.0 with Runtime Library Exception
+
+  See https://swift.org/LICENSE.txt for license information
+  See https://swift.org/CONTRIBUTORS.txt for Swift project authors
+-->
+
+<template>
+  <div
+    class="declaration-group"
+    :class="classes"
+    ref="apiChangesDiff"
+  >
+    <p v-if="shouldCaption" class="platforms">
+      <strong>{{ caption }}</strong>
+    </p>
+    <Source
+      :tokens="declaration.tokens"
+      :language="interfaceLanguage"
+    />
+  </div>
+</template>
+
+<script>
+import DeclarationSource from 'docc-render/components/DocumentationTopic/PrimaryContent/DeclarationSource.vue';
+import Language from 'docc-render/constants/Language';
+import { APIChangesMultipleLines } from 'docc-render/mixins/apiChangesHelpers';
+
+/**
+ * Renders a code source with an optional caption.
+ */
+export default {
+  name: 'DeclarationGroup',
+  components: {
+    Source: DeclarationSource,
+  },
+  mixins: [APIChangesMultipleLines],
+  inject: {
+    languages: {
+      default: () => new Set(),
+    },
+    interfaceLanguage: {
+      default: () => Language.swift.key.api,
+    },
+    symbolKind: {
+      default: () => undefined,
+    },
+  },
+  props: {
+    declaration: {
+      type: Object,
+      required: true,
+    },
+    /**
+     * Whether to show the caption or not.
+     * Usually if there is more than Declaration group.
+     */
+    shouldCaption: {
+      type: Boolean,
+      default: false,
+    },
+    /**
+     * The type of code change.
+     * @type {"added"|"deprecated"|"modified"}
+     */
+    changeType: {
+      type: String,
+      required: false,
+    },
+  },
+  computed: {
+    classes: ({
+      changeType,
+      multipleLinesClass,
+      displaysMultipleLinesAfterAPIChanges,
+    }) => ({
+      [`declaration-group--changed declaration-group--${changeType}`]: changeType,
+      [multipleLinesClass]: displaysMultipleLinesAfterAPIChanges,
+    }),
+    caption() {
+      return this.declaration.platforms.join(', ');
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+@import 'docc-render/styles/_core.scss';
+
+.platforms {
+  @include font-styles(body-reduced);
+
+  margin-bottom: 0.45rem;
+  margin-top: var(--spacing-stacked-margin-xlarge);
+
+  .changed & {
+    padding-left: $code-source-spacing;
+  }
+
+  &:first-of-type {
+    margin-top: 1rem;
+  }
+}
+
+.source {
+  transition: margin 0.3s linear;
+
+  .platforms + & {
+    margin: 0;
+  }
+}
+
+// don't highlight tokens in initial declaration until the user has explicitly
+// expanded a list of overloaded declarations — this rule could be simplified
+// in the future if the HTML is restructured to have an expanded state class for
+// the whole list instead of having it on each declaration
+.declaration-pill:not(.declaration-pill--expanded) {
+  .source:deep(.highlighted) {
+    background: unset;
+    font-weight: normal;
+  }
+}
+
+// only applicable for when other declaration list is expanded
+.declaration-pill--expanded {
+  $docs-declaration-source-border-width: 1px;
+
+  .source {
+    border-width: $docs-declaration-source-border-width;
+
+    // ensure links are not clickable, when expanded
+    :deep(a) {
+      pointer-events: none;
+    }
+  }
+
+  &.selected-declaration {
+    .source {
+      border-color: var(--color-focus-border-color, var(--color-focus-border-color));
+    }
+  }
+
+  &:not(.selected-declaration) {
+    .source {
+      background: none;
+    }
+  }
+}
+
+@include changedStyles {
+  .source {
+    // background should also be applied over changed icon over whole pill
+    background: none;
+    border: none;
+    margin-top: 0;
+    margin-bottom: 0;
+    margin-left: $change-icon-occupied-space;
+    padding-left: 0;
+  }
+}
+</style>
diff --git a/src/components/DocumentationTopic/PrimaryContent/DeclarationList.vue b/src/components/DocumentationTopic/PrimaryContent/DeclarationList.vue
index 0461e3808..a06b75d5b 100644
--- a/src/components/DocumentationTopic/PrimaryContent/DeclarationList.vue
+++ b/src/components/DocumentationTopic/PrimaryContent/DeclarationList.vue
@@ -1,7 +1,7 @@
 <!--
   This source file is part of the Swift.org open source project
 
-  Copyright (c) 2021-2023 Apple Inc. and the Swift project authors
+  Copyright (c) 2021-2024 Apple Inc. and the Swift project authors
   Licensed under Apache License v2.0 with Runtime Library Exception
 
   See https://swift.org/LICENSE.txt for license information
@@ -10,14 +10,8 @@
 
 <template>
   <div
-    class="declaration-group"
-    :class="classes"
-    ref="apiChangesDiff"
+    class="declaration-list"
   >
-    <p v-if="shouldCaption" class="platforms">
-      <strong>{{ caption }}</strong>
-    </p>
-
     <transition-expand
       v-for="declaration in declarationTokens"
       :key="declaration.identifier"
@@ -27,19 +21,17 @@
         class="declaration-pill"
         :class="{
           'declaration-pill--expanded': hasOtherDeclarations && isExpanded,
+          [changeClasses]: changeType && declaration.identifier === selectedIdentifier,
+          'selected-declaration': isSelectedDeclaration(declaration.identifier),
         }"
       >
         <component
           :is="getWrapperComponent(declaration)"
           @click="selectDeclaration(declaration.identifier)"
-          class="declaration-source-wrapper"
+          class="declaration-group-wrapper"
         >
-          <Source
-            :tokens="declaration.tokens"
-            :language="interfaceLanguage"
-            :class="{
-              'selected-declaration': isSelectedDeclaration(declaration.identifier),
-            }"
+          <DeclarationGroup
+            v-bind="getDeclProp(declaration)"
           />
         </component>
       </div>
@@ -48,10 +40,8 @@
 </template>
 
 <script>
-import DeclarationSource from 'docc-render/components/DocumentationTopic/PrimaryContent/DeclarationSource.vue';
-import Language from 'docc-render/constants/Language';
+import DeclarationGroup from 'docc-render/components/DocumentationTopic/PrimaryContent/DeclarationGroup.vue';
 import TransitionExpand from 'docc-render/components/TransitionExpand.vue';
-import { APIChangesMultipleLines } from 'docc-render/mixins/apiChangesHelpers';
 import { waitFor } from 'docc-render/utils/loading';
 import { buildUrl } from 'docc-render/utils/url-helper';
 
@@ -59,9 +49,9 @@ import { buildUrl } from 'docc-render/utils/url-helper';
  * Renders a code source with an optional caption.
  */
 export default {
-  name: 'DeclarationGroup',
+  name: 'DeclarationList',
   components: {
-    Source: DeclarationSource,
+    DeclarationGroup,
     TransitionExpand,
   },
   data() {
@@ -69,17 +59,7 @@ export default {
       selectedIdentifier: this.identifier,
     };
   },
-  mixins: [APIChangesMultipleLines],
   inject: {
-    languages: {
-      default: () => new Set(),
-    },
-    interfaceLanguage: {
-      default: () => Language.swift.key.api,
-    },
-    symbolKind: {
-      default: () => undefined,
-    },
     store: {
       default: () => ({
         state: {
@@ -118,13 +98,14 @@ export default {
     },
   },
   computed: {
+    changeClasses: ({ changeType }) => `changed changed-${changeType}`,
     hasOtherDeclarations: ({ declaration }) => declaration.otherDeclarations || null,
     declarationTokens: ({
       declaration,
       hasOtherDeclarations,
       identifier,
     }) => {
-      if (!hasOtherDeclarations) return [declaration];
+      if (!hasOtherDeclarations) return [{ ...declaration, identifier }];
       const {
         otherDeclarations: {
           declarations,
@@ -140,14 +121,6 @@ export default {
         ...declarations.slice(displayIndex),
       ];
     },
-    classes: ({ changeType, multipleLinesClass, displaysMultipleLinesAfterAPIChanges }) => ({
-      [`declaration-group--changed declaration-group--${changeType}`]: changeType,
-      [multipleLinesClass]: displaysMultipleLinesAfterAPIChanges,
-    }),
-    caption() {
-      return this.declaration.platforms.join(', ');
-    },
-    isSwift: ({ interfaceLanguage }) => interfaceLanguage === Language.swift.key.api,
     references: ({ store }) => store.state.references,
     isExpanded: {
       get: ({ declListExpanded }) => declListExpanded,
@@ -158,7 +131,7 @@ export default {
   },
   methods: {
     async selectDeclaration(identifier) {
-      if (identifier === this.identifier) return;
+      if (identifier === this.identifier || !this.isExpanded) return;
       this.selectedIdentifier = identifier;
       await this.$nextTick(); // wait for identifier to update
       this.isExpanded = false; // collapse the list
@@ -170,6 +143,16 @@ export default {
       return (!this.isExpanded || decl.identifier === this.identifier)
         ? 'div' : 'button';
     },
+    getDeclProp(decl) {
+      return !this.hasOtherDeclarations || decl.identifier === this.identifier
+        ? {
+          declaration: decl,
+          shouldCaption: this.shouldCaption,
+          changeType: this.changeType,
+        } : {
+          declaration: decl,
+        };
+    },
     isSelectedDeclaration(identifier) {
       return identifier === this.selectedIdentifier;
     },
@@ -180,52 +163,16 @@ export default {
 <style scoped lang="scss">
 @import 'docc-render/styles/_core.scss';
 
-.platforms {
-  @include font-styles(body-reduced);
-
-  margin-bottom: 0.45rem;
-  margin-top: var(--spacing-stacked-margin-xlarge);
-
-  .changed & {
-    padding-left: $code-source-spacing;
-  }
-
-  &:first-of-type {
-    margin-top: 1rem;
-  }
-}
-
 .declaration-pill--expanded {
   transition-timing-function: linear;
   transition-property: opacity, height;
-  $docs-declaration-source-border-width: 1px;
-
-  .source {
-    border-width: $docs-declaration-source-border-width;
-
-    // ensure links are not clickable, when expanded
-    :deep(a) {
-      pointer-events: none;
-    }
-  }
+  margin: var(--declaration-code-listing-margin);
 
   > button {
     display: block;
     width: 100%;
   }
 
-  .selected-declaration {
-    border-color: var(--color-focus-border-color, var(--color-focus-border-color));
-  }
-
-  :not(.selected-declaration) {
-    background: unset;
-  }
-
-  + .declaration-pill--expanded .source {
-    margin: var(--declaration-code-listing-margin);
-  }
-
   &.expand-enter, &.expand-leave-to {
     opacity: 0;
 
@@ -233,27 +180,20 @@ export default {
       margin: 0;
     }
   }
-}
-
-.source {
-  transition: margin 0.3s linear;
 
-  .platforms + & {
-    margin: 0;
+  :deep(.highlighted) {
+    background: var(--color-syntax-highlighted, mark);
+    font-weight: $font-weight-semibold;
+    transition:
+      background 0.3s linear,
+      font-weight 0.3s linear;
   }
 }
 
 @include changedStyles {
-  &.declaration-group {
+  &.selected-declaration {
+    // add back unset background for pills with changes
     background: var(--background, var(--color-code-background));
   }
-  .source {
-    background: none;
-    border: none;
-    margin-top: 0;
-    margin-bottom: 0;
-    margin-left: $change-icon-occupied-space;
-    padding-left: 0;
-  }
 }
 </style>
diff --git a/src/components/DocumentationTopic/PrimaryContent/DeclarationSource.vue b/src/components/DocumentationTopic/PrimaryContent/DeclarationSource.vue
index 6ae06c926..9a8ac5782 100644
--- a/src/components/DocumentationTopic/PrimaryContent/DeclarationSource.vue
+++ b/src/components/DocumentationTopic/PrimaryContent/DeclarationSource.vue
@@ -16,6 +16,7 @@
   ><CodeBlock ref="code"><Token
     v-for="(token, i) in formattedTokens"
     :key="i"
+    :class="extraClassesFor(token)"
     v-bind="propsFor(token)" /></CodeBlock></pre>
 </template>
 
@@ -32,6 +33,12 @@ const { TokenKind } = DeclarationToken.constants;
 
 const DEFAULT_INDENTATION_WIDTH = 4;
 
+const HighlightKind = {
+  added: 'added',
+  changed: 'changed',
+  removed: 'removed',
+};
+
 export default {
   name: 'DeclarationSource',
   data() {
@@ -41,6 +48,7 @@ export default {
     };
   },
   components: { Token: DeclarationToken, CodeBlock },
+  constants: { HighlightKind },
   props: {
     tokens: {
       type: Array,
@@ -203,6 +211,11 @@ export default {
     handleWindowResize() {
       this.displaysMultipleLines = displaysMultipleLines(this.$refs.declarationGroup);
     },
+    extraClassesFor(token) {
+      return {
+        highlighted: token.highlight === HighlightKind.changed,
+      };
+    },
   },
   async mounted() {
     window.addEventListener('resize', this.handleWindowResize);
diff --git a/src/components/DocumentationTopic/PrimaryContent/DeclarationToken.vue b/src/components/DocumentationTopic/PrimaryContent/DeclarationToken.vue
index e21fc1d24..979254b5e 100644
--- a/src/components/DocumentationTopic/PrimaryContent/DeclarationToken.vue
+++ b/src/components/DocumentationTopic/PrimaryContent/DeclarationToken.vue
@@ -33,7 +33,7 @@ const TokenKind = {
 
 export default {
   name: 'DeclarationToken',
-  render(createElement) {
+  render: function _render(createElement) {
     const {
       kind,
       text,
diff --git a/src/components/DocumentationTopic/PrimaryContent/DeclarationToken/RawText.vue b/src/components/DocumentationTopic/PrimaryContent/DeclarationToken/RawText.vue
index 08f57d9b7..efa471247 100644
--- a/src/components/DocumentationTopic/PrimaryContent/DeclarationToken/RawText.vue
+++ b/src/components/DocumentationTopic/PrimaryContent/DeclarationToken/RawText.vue
@@ -7,21 +7,13 @@
   See https://swift.org/LICENSE.txt for license information
   See https://swift.org/CONTRIBUTORS.txt for Swift project authors
 -->
+<template>
+  <span>{{text}}</span>
+</template>
 
 <script>
-// This component is an optimization that allows us to emit raw text DOM nodes
-// for simple text tokens that have no need for a wrapper element. This uses a
-// private Vue API (`this._v`) and falls back to adding an empty <span> tag if
-// that API goes away in the future.
 export default {
   name: 'RawText',
-  render(createElement) {
-    const {
-      _v: createTextNode = str => createElement('span', str),
-      text,
-    } = this;
-    return createTextNode(text);
-  },
   props: {
     text: {
       type: String,
diff --git a/src/components/DocumentationTopic/Relationships.vue b/src/components/DocumentationTopic/Relationships.vue
index a992028d9..4d0e522ff 100644
--- a/src/components/DocumentationTopic/Relationships.vue
+++ b/src/components/DocumentationTopic/Relationships.vue
@@ -1,7 +1,7 @@
 <!--
   This source file is part of the Swift.org open source project
 
-  Copyright (c) 2021-2023 Apple Inc. and the Swift project authors
+  Copyright (c) 2021-2024 Apple Inc. and the Swift project authors
   Licensed under Apache License v2.0 with Runtime Library Exception
 
   See https://swift.org/LICENSE.txt for license information
@@ -12,6 +12,7 @@
   <ContentTable
     :anchor="contentSectionData.anchor"
     :title="$t(contentSectionData.title)"
+    :enableMinimized="enableMinimized"
   >
     <Section
       v-for="section in sectionsWithSymbols"
@@ -44,6 +45,10 @@ export default {
       type: Array,
       required: true,
     },
+    enableMinimized: {
+      type: Boolean,
+      default: false,
+    },
   },
   computed: {
     contentSectionData: () => MainContentSectionAnchors.relationships,
diff --git a/src/components/NavBase.vue b/src/components/NavBase.vue
index cde289460..6d4dbcc49 100644
--- a/src/components/NavBase.vue
+++ b/src/components/NavBase.vue
@@ -668,7 +668,6 @@ $content-max-width: map-deep-get($breakpoint-attributes, (nav, large, content-wi
 
     @include nav-is-wide-format(true) {
       width: 100%;
-      justify-content: center;
     }
   }
 }
@@ -676,7 +675,6 @@ $content-max-width: map-deep-get($breakpoint-attributes, (nav, large, content-wi
 .nav-title {
   height: $nav-height;
   @include font-styles(nav-title);
-  cursor: default;
   display: flex;
   align-items: center;
   white-space: nowrap;
diff --git a/src/components/Navigator.vue b/src/components/Navigator.vue
index 3543f11d0..b621472a6 100644
--- a/src/components/Navigator.vue
+++ b/src/components/Navigator.vue
@@ -14,7 +14,7 @@
     class="navigator"
   >
     <NavigatorCard
-      v-if="!isFetching"
+      v-show="!isFetching"
       v-bind="technologyProps"
       :type="type"
       :children="flatChildren"
@@ -28,12 +28,12 @@
     >
       <template #filter><slot name="filter" /></template>
       <template #navigator-head>
-        <slot name="navigator-head"/>
+        <slot name="navigator-head" className="nav-title"/>
       </template>
     </NavigatorCard>
     <LoadingNavigatorCard
       @close="$emit('close')"
-      v-else
+      v-if="isFetching"
     />
     <div aria-live="polite" class="visuallyhidden">
       {{ $t('navigator.navigator-is', {
@@ -178,4 +178,10 @@ export default {
     transition: none;
   }
 }
+
+:deep(.nav-title) {
+  font-size: inherit;
+  font-weight: inherit;
+  flex-grow: 1;
+}
 </style>
diff --git a/src/components/Navigator/BaseNavigatorCard.vue b/src/components/Navigator/BaseNavigatorCard.vue
index ba7651a71..9ef7bdd0c 100644
--- a/src/components/Navigator/BaseNavigatorCard.vue
+++ b/src/components/Navigator/BaseNavigatorCard.vue
@@ -121,6 +121,7 @@ $close-icon-padding: 5px;
 }
 
 .close-card {
+  margin: 0;
 
   .close-icon {
     width: $close-icon-size;
diff --git a/src/components/Navigator/NavigatorDataProvider.vue b/src/components/Navigator/NavigatorDataProvider.vue
index 8ba95a641..23c5c9d22 100644
--- a/src/components/Navigator/NavigatorDataProvider.vue
+++ b/src/components/Navigator/NavigatorDataProvider.vue
@@ -11,6 +11,7 @@
 <script>
 import { fetchIndexPathsData } from 'docc-render/utils/data';
 import { flattenNestedData } from 'docc-render/utils/navigatorData';
+import AppStore from 'docc-render/stores/AppStore';
 import Language from 'docc-render/constants/Language';
 
 /**
@@ -79,20 +80,26 @@ export default {
         currentLangTechnologies = navigationIndex[Language.swift.key.url] || [];
       }
       // find the current technology
-      return currentLangTechnologies.find(t => (
+      const currentTechnology = currentLangTechnologies.find(t => (
         technologyPath.toLowerCase() === t.path.toLowerCase()
       ));
+      return currentTechnology ?? currentLangTechnologies[0];
     },
   },
   methods: {
     async fetchIndexData() {
       try {
         this.isFetching = true;
-        const { interfaceLanguages, references } = await fetchIndexPathsData(
+        const {
+          includedArchiveIdentifiers = [],
+          interfaceLanguages,
+          references,
+        } = await fetchIndexPathsData(
           { slug: this.$route.params.locale || '' },
         );
         this.navigationIndex = Object.freeze(interfaceLanguages);
         this.navigationReferences = Object.freeze(references);
+        AppStore.setIncludedArchiveIdentifiers(includedArchiveIdentifiers);
       } catch (e) {
         this.errorFetching = true;
       } finally {
diff --git a/src/components/TopicTypeIcon.vue b/src/components/TopicTypeIcon.vue
index 1dad26203..445429caf 100644
--- a/src/components/TopicTypeIcon.vue
+++ b/src/components/TopicTypeIcon.vue
@@ -150,7 +150,6 @@ export default {
     display: block;
     width: 100%;
     height: 100%;
-    object-fit: contain;
   }
 }
 </style>
diff --git a/src/components/Tutorial.vue b/src/components/Tutorial.vue
index ff8e8c6c4..4e3bcb583 100644
--- a/src/components/Tutorial.vue
+++ b/src/components/Tutorial.vue
@@ -18,7 +18,7 @@
       :rootReference="hierarchy.reference"
       :identifierUrl="identifierUrl"
     />
-    <main id="main"  tabindex="0">
+    <main id="app-main"  tabindex="0">
       <Section
         v-for="(section, index) in sections"
         :section="section"
diff --git a/src/components/TutorialsOverview.vue b/src/components/TutorialsOverview.vue
index 20c4cfec9..25b68fcc8 100644
--- a/src/components/TutorialsOverview.vue
+++ b/src/components/TutorialsOverview.vue
@@ -17,7 +17,7 @@
     >
       {{ title }}
     </Nav>
-    <main id="main" tabindex="0" class="main">
+    <main id="app-main" tabindex="0" class="main">
       <div class="radial-gradient">
         <slot name="above-hero" />
         <Hero
diff --git a/src/mixins/metadata.js b/src/mixins/metadata.js
index c2284893a..1e29ae999 100644
--- a/src/mixins/metadata.js
+++ b/src/mixins/metadata.js
@@ -18,9 +18,11 @@ export default {
     // Extracts the first paragraph of plaintext from the given content tree,
     // which can be used for metadata purposes.
     extractFirstParagraphText(content = []) {
+      const { references = {} } = this;
       const plaintext = ContentNode.computed.plaintext.bind({
         ...ContentNode.methods,
         content,
+        references,
       })();
       return firstParagraph(plaintext);
     },
diff --git a/src/mixins/referencesProvider.js b/src/mixins/referencesProvider.js
index 14111b99c..bf45a4e4d 100644
--- a/src/mixins/referencesProvider.js
+++ b/src/mixins/referencesProvider.js
@@ -7,6 +7,7 @@
  * See https://swift.org/LICENSE.txt for license information
  * See https://swift.org/CONTRIBUTORS.txt for Swift project authors
 */
+import AppStore from 'docc-render/stores/AppStore';
 
 export default {
   // inject the `store`
@@ -21,8 +22,39 @@ export default {
       }),
     },
   },
+  data: () => ({ appState: AppStore.state }),
   computed: {
     // exposes the references for the current page
-    references: ({ store }) => store.state.references,
+    references() {
+      const {
+        isFromIncludedArchive,
+        store: {
+          state: { references: originalRefs = {} },
+        },
+      } = this;
+      // strip the `url` key from refs if their identifier comes from an
+      // archive that hasn't been included by DocC
+      return Object.keys(originalRefs).reduce((newRefs, id) => {
+        const { url, ...refWithoutUrl } = originalRefs[id];
+        return {
+          ...newRefs,
+          [id]: isFromIncludedArchive(id) ? originalRefs[id] : refWithoutUrl,
+        };
+      }, {});
+    },
+  },
+  methods: {
+    isFromIncludedArchive(id) {
+      const { includedArchiveIdentifiers = [] } = this.appState;
+      // for backwards compatibility purposes, treat all references as being
+      // from included archives if there is no data for it
+      if (!includedArchiveIdentifiers.length) {
+        return true;
+      }
+
+      return includedArchiveIdentifiers.some(archiveId => (
+        id?.startsWith(`doc://${archiveId}/`)
+      ));
+    },
   },
 };
diff --git a/src/routes.js b/src/routes.js
index da7d09e39..0c928ce37 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -32,7 +32,7 @@ export default [
     ),
   },
   {
-    path: '/documentation/*',
+    path: '/documentation*',
     name: documentationTopicName,
     component: () => import(
       /* webpackChunkName: "documentation-topic" */ 'theme/views/DocumentationTopic.vue'
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index ca8231183..76e15aa3a 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -30,6 +30,7 @@ export default {
     supportsAutoColorScheme,
     systemColorScheme: ColorScheme.light,
     availableLocales: [],
+    includedArchiveIdentifiers: [],
   },
   reset() {
     this.state.imageLoadingStrategy = process.env.VUE_APP_TARGET === 'ide'
@@ -37,6 +38,7 @@ export default {
     this.state.preferredColorScheme = Settings.preferredColorScheme || defaultColorScheme;
     this.state.supportsAutoColorScheme = supportsAutoColorScheme;
     this.state.systemColorScheme = ColorScheme.light;
+    this.state.includedArchiveIdentifiers = [];
   },
   setImageLoadingStrategy(strategy) {
     this.state.imageLoadingStrategy = strategy;
@@ -59,6 +61,9 @@ export default {
   setSystemColorScheme(value) {
     this.state.systemColorScheme = value;
   },
+  setIncludedArchiveIdentifiers(value) {
+    this.state.includedArchiveIdentifiers = value;
+  },
   syncPreferredColorScheme() {
     if (!!Settings.preferredColorScheme
       && Settings.preferredColorScheme !== this.state.preferredColorScheme) {
diff --git a/src/styles/_base.scss b/src/styles/_base.scss
index aabb33567..ec8e3b97e 100644
--- a/src/styles/_base.scss
+++ b/src/styles/_base.scss
@@ -21,7 +21,7 @@
 // import the current theme _base file. This file imports fonts and other global styles
 @import "~theme/styles/_theme_base.scss";
 
-#main {
+#app-main {
   outline-style: none;
 }
 
diff --git a/src/styles/base/_reset.scss b/src/styles/base/_reset.scss
index aa8042287..e5589cccb 100644
--- a/src/styles/base/_reset.scss
+++ b/src/styles/base/_reset.scss
@@ -162,7 +162,7 @@ button {
 @media print {
 
   body,
-  #main,
+  #app-main,
   #content {
     color: #000;
   }
diff --git a/src/styles/core/colors/_dark.scss b/src/styles/core/colors/_dark.scss
index b2867f73b..f64c64a77 100644
--- a/src/styles/core/colors/_dark.scss
+++ b/src/styles/core/colors/_dark.scss
@@ -63,6 +63,7 @@
   --color-syntax-comments: rgb(127, 140, 152);
   --color-syntax-documentation-markup: rgb(127, 140, 152);
   --color-syntax-documentation-markup-keywords: rgb(163, 177, 191);
+  --color-syntax-highlighted: rgba(0, 113, 227, 0.6);
   --color-syntax-keywords: rgb(255, 122, 178);
   --color-syntax-marks: rgb(255, 255, 255);
   --color-syntax-numbers: rgb(217, 201, 124);
diff --git a/src/styles/core/colors/_light.scss b/src/styles/core/colors/_light.scss
index ea3c211d2..ffdb91408 100644
--- a/src/styles/core/colors/_light.scss
+++ b/src/styles/core/colors/_light.scss
@@ -152,6 +152,7 @@
   --color-syntax-documentation-markup: rgb(80, 99, 117);
   --color-syntax-documentation-markup-keywords: rgb(80, 99, 117);
   --color-syntax-heading: rgb(186, 45, 162);
+  --color-syntax-highlighted: rgba(0, 113, 227, 0.2);
   --color-syntax-keywords: rgb(173, 61, 164);
   --color-syntax-marks: rgb(0, 0, 0);
   --color-syntax-numbers: rgb(39, 42, 216);
diff --git a/src/utils/indentation.js b/src/utils/indentation.js
index 972259ff6..48495c928 100644
--- a/src/utils/indentation.js
+++ b/src/utils/indentation.js
@@ -10,7 +10,18 @@
 
 import Language from 'docc-render/constants/Language';
 
+const ObjcMethodPrefix = {
+  instance: '-',
+  klass: '+',
+};
+
 function indentObjcDeclaration(codeElement) {
+  // only attempt to indent declarations for Objective-C instance/class methods
+  const txt = codeElement.textContent ?? '';
+  if (!txt.startsWith(ObjcMethodPrefix.instance) && !txt.startsWith(ObjcMethodPrefix.klass)) {
+    return;
+  }
+
   // find all param name spans (which are tokenized as "token-identifier"s)
   const params = codeElement.getElementsByClassName('token-identifier');
   if (params.length < 2) {
diff --git a/src/views/DocumentationTopic.vue b/src/views/DocumentationTopic.vue
index 64e1b76e9..4ba8f7129 100644
--- a/src/views/DocumentationTopic.vue
+++ b/src/views/DocumentationTopic.vue
@@ -14,11 +14,11 @@
       v-if="topicData"
       v-bind="documentationLayoutProps"
     >
-      <template #nav-title>
+      <template #nav-title="{ className }">
         <component
-          :is="rootLink ? 'router-link' : 'span'"
+          :is="rootLink ? 'router-link' : 'h2'"
           :to="rootLink"
-          class="nav-title"
+          :class="className"
         >
           {{ $t('documentation.title') }}
         </component>
diff --git a/tests/unit/App.spec.js b/tests/unit/App.spec.js
index 6023b3dc9..61dc9b7a0 100644
--- a/tests/unit/App.spec.js
+++ b/tests/unit/App.spec.js
@@ -117,7 +117,7 @@ describe('App', () => {
     const wrapper = createWrapper();
     const skipNavigation = wrapper.find('#skip-nav');
     expect(skipNavigation.text()).toBe('accessibility.skip-navigation');
-    expect(skipNavigation.attributes('href')).toBe('#main');
+    expect(skipNavigation.attributes('href')).toBe('#app-main');
   });
 
   it('exposes a header slot', () => {
diff --git a/tests/unit/components/ContentNode.spec.js b/tests/unit/components/ContentNode.spec.js
index 337bd3e19..b028ac0ea 100644
--- a/tests/unit/components/ContentNode.spec.js
+++ b/tests/unit/components/ContentNode.spec.js
@@ -2538,10 +2538,58 @@ describe('ContentNode', () => {
                 },
               ],
             },
+            {
+              type: ContentNode.BlockType.paragraph,
+              inlineContent: [
+                {
+                  type: ContentNode.InlineType.codeVoice,
+                  code: 'C',
+                },
+              ],
+            },
+          ],
+        },
+      });
+      expect(wrapper.vm.plaintext).toBe('A\nB\nC');
+    });
+
+    it('includes text from references', () => {
+      const wrapper = shallowMount(ContentNode, {
+        propsData: {
+          content: [
+            {
+              type: ContentNode.BlockType.paragraph,
+              inlineContent: [
+                {
+                  type: ContentNode.InlineType.text,
+                  text: 'A',
+                },
+                {
+                  type: ContentNode.InlineType.text,
+                  text: ' ',
+                },
+                {
+                  type: ContentNode.InlineType.reference,
+                  identifier: 'b',
+                },
+              ],
+            },
           ],
         },
+        provide: {
+          store: {
+            state: {
+              references: {
+                b: {
+                  title: 'B',
+                  url: '/b',
+                },
+              },
+            },
+          },
+        },
       });
-      expect(wrapper.vm.plaintext).toBe('A\nB');
+      expect(wrapper.vm.plaintext).toBe('A B');
     });
   });
 });
diff --git a/tests/unit/components/DocumentationLayout.spec.js b/tests/unit/components/DocumentationLayout.spec.js
index d2c22a73e..0eeb73a9d 100644
--- a/tests/unit/components/DocumentationLayout.spec.js
+++ b/tests/unit/components/DocumentationLayout.spec.js
@@ -41,7 +41,7 @@ const navigatorReferences = { foo: {} };
 
 jest.spyOn(dataUtils, 'fetchIndexPathsData').mockResolvedValue({
   interfaceLanguages: {
-    [Language.swift.key.url]: [TechnologyWithChildren, { path: 'another/technology' }],
+    [Language.swift.key.url]: [TechnologyWithChildren],
   },
   references: navigatorReferences,
 });
diff --git a/tests/unit/components/DocumentationTopic.spec.js b/tests/unit/components/DocumentationTopic.spec.js
index 8d978dadb..56632dcdf 100644
--- a/tests/unit/components/DocumentationTopic.spec.js
+++ b/tests/unit/components/DocumentationTopic.spec.js
@@ -278,7 +278,7 @@ describe('DocumentationTopic', () => {
     const main = wrapper.find('main');
     expect(main.exists()).toBe(true);
     expect(main.classes('main')).toBe(true);
-    expect(main.attributes('id')).toBe('main');
+    expect(main.attributes('id')).toBe('app-main');
   });
 
   it('renders a <div> instead of <main> in IDE mode', () => {
@@ -293,7 +293,7 @@ describe('DocumentationTopic', () => {
     expect(wrapper.find('main').exists()).toBe(false);
     const div = wrapper.find('.main');
     expect(div.exists()).toBe(true);
-    expect(div.attributes('id')).toBe('main');
+    expect(div.attributes('id')).toBe('app-main');
   });
 
   it('renders an aria live that tells VO users which it is the current page content', () => {
@@ -692,6 +692,7 @@ describe('DocumentationTopic', () => {
     const viewMore = wrapper.find(ViewMore);
     expect(viewMore.exists()).toBe(true);
     expect(viewMore.props('url')).toEqual('/documentation/swift'); // normalized path
+    expect(viewMore.classes()).toContain('minimized-container');
 
     // should not render `ViewMore` in non-minimized mode
     wrapper.setProps({ enableMinimized: false });
@@ -984,10 +985,7 @@ describe('DocumentationTopic', () => {
     const relationships = wrapper.find(Relationships);
     expect(relationships.exists()).toBe(true);
     expect(relationships.props('sections')).toBe(relationshipsSections);
-
-    // Minimized view should not render Relationships
-    wrapper.setProps({ enableMinimized: true });
-    expect(wrapper.find(Relationships).exists()).toBe(false);
+    expect(relationships.props('enableMinimized')).toBe(false);
   });
 
   it('renders `Relationships` before `SeeAlso`', () => {
diff --git a/tests/unit/components/DocumentationTopic/ContentTable.spec.js b/tests/unit/components/DocumentationTopic/ContentTable.spec.js
index 10ad63720..ddb5b9e2a 100644
--- a/tests/unit/components/DocumentationTopic/ContentTable.spec.js
+++ b/tests/unit/components/DocumentationTopic/ContentTable.spec.js
@@ -1,7 +1,7 @@
 /**
  * This source file is part of the Swift.org open source project
  *
- * Copyright (c) 2021 Apple Inc. and the Swift project authors
+ * Copyright (c) 2021-2024 Apple Inc. and the Swift project authors
  * Licensed under Apache License v2.0 with Runtime Library Exception
  *
  * See https://swift.org/LICENSE.txt for license information
@@ -45,4 +45,12 @@ describe('ContentTable', () => {
     expect(p.exists()).toBe(true);
     expect(p.html()).toBe(slots.default);
   });
+
+  it('renders `minimized-container` class if in minimized mode', () => {
+    const container = wrapper.find('.container');
+    expect(container.classes()).not.toContain('minimized-container');
+
+    wrapper.setProps({ enableMinimized: true });
+    expect(container.classes()).toContain('minimized-container');
+  });
 });
diff --git a/tests/unit/components/DocumentationTopic/PrimaryContent/Declaration.spec.js b/tests/unit/components/DocumentationTopic/PrimaryContent/Declaration.spec.js
index e907487a4..fc9982f8b 100644
--- a/tests/unit/components/DocumentationTopic/PrimaryContent/Declaration.spec.js
+++ b/tests/unit/components/DocumentationTopic/PrimaryContent/Declaration.spec.js
@@ -161,6 +161,31 @@ describe('Declaration', () => {
     expect(labels.at(1).props('shouldCaption')).toBe(true);
   });
 
+  it('does not render captions when multiple declarations have the same platforms', () => {
+    const declarations = [
+      propsData.declarations[0],
+      {
+        platforms: [
+          'macOS',
+        ],
+        tokens: [
+          {
+            kind: TokenKind.keyword,
+            text: 'let',
+          },
+          ...propsData.declarations[0].tokens.slice(1),
+        ],
+      },
+    ];
+
+    wrapper.setProps({ declarations });
+
+    const labels = wrapper.findAll(DeclarationList);
+    expect(labels.length).toBe(declarations.length);
+    expect(labels.at(0).props('shouldCaption')).toBe(false);
+    expect(labels.at(1).props('shouldCaption')).toBe(false);
+  });
+
   it('renders a `DeclarationDiff` when there are API changes for current and previous and collapsed other declaration list', () => {
     // no DeclarationDiff if no changes
     expect(wrapper.find(DeclarationDiff).exists()).toBe(false);
@@ -186,8 +211,6 @@ describe('Declaration', () => {
     expect(declarationDiff.exists()).toBe(true);
     expect(declarationDiff.props()).toEqual({
       changes: provide.store.state.apiChanges.foo,
-      // when `new` and `previous` are provided, change type is always `modified`
-      changeType: ChangeTypes.modified,
     });
     expect(declarationDiff.classes()).toContain('changed');
     expect(declarationDiff.classes()).toContain('changed-modified');
@@ -198,7 +221,7 @@ describe('Declaration', () => {
     expect(wrapper.find(DeclarationDiff).exists()).toBe(false);
   });
 
-  it('renders a `DeclarationList` for `added` change type', () => {
+  it('renders a `DeclarationList` with `added` change type prop', () => {
     const provide = provideFactory({
       [identifier]: {
         change: ChangeTypes.added,
@@ -218,17 +241,12 @@ describe('Declaration', () => {
     const declarationList = wrapper.find(DeclarationList);
     expect(declarationList.props('changeType')).toBe(ChangeTypes.added);
     expect(declarationList.props('declaration')).toBe(propsData.declarations[0]);
-    expect(declarationList.classes()).toContain('changed');
-    expect(declarationList.classes()).toContain('changed-added');
   });
 
-  it('renders a `DeclarationList` for `deprecated` change type', () => {
+  it('passes `added` type change prop if no declarations are present in the diff ', () => {
     const provide = provideFactory({
       [identifier]: {
-        change: ChangeTypes.deprecated,
-        declaration: {
-          previous: [{}],
-        },
+        change: ChangeTypes.added,
       },
     });
 
@@ -240,16 +258,17 @@ describe('Declaration', () => {
     expect(wrapper.find(DeclarationDiff).exists()).toBe(false);
 
     const declarationList = wrapper.find(DeclarationList);
-    expect(declarationList.props('changeType')).toBe(ChangeTypes.deprecated);
+    expect(declarationList.props('changeType')).toBe(ChangeTypes.added);
     expect(declarationList.props('declaration')).toBe(propsData.declarations[0]);
-    expect(declarationList.classes()).toContain('changed');
-    expect(declarationList.classes()).toContain('changed-deprecated');
   });
 
-  it('applies only `added` type change class if no declarations are present in the diff ', () => {
+  it('renders a `DeclarationList` with `deprecated` change type prop', () => {
     const provide = provideFactory({
       [identifier]: {
-        change: ChangeTypes.added,
+        change: ChangeTypes.deprecated,
+        declaration: {
+          previous: [{}],
+        },
       },
     });
 
@@ -261,9 +280,7 @@ describe('Declaration', () => {
     expect(wrapper.find(DeclarationDiff).exists()).toBe(false);
 
     const declarationList = wrapper.find(DeclarationList);
-    expect(declarationList.props('changeType')).toBe(ChangeTypes.added);
+    expect(declarationList.props('changeType')).toBe(ChangeTypes.deprecated);
     expect(declarationList.props('declaration')).toBe(propsData.declarations[0]);
-    expect(declarationList.classes()).toContain('changed');
-    expect(declarationList.classes()).toContain('changed-added');
   });
 });
diff --git a/tests/unit/components/DocumentationTopic/PrimaryContent/DeclarationDiff.spec.js b/tests/unit/components/DocumentationTopic/PrimaryContent/DeclarationDiff.spec.js
index 1b5f554ce..6b6ed04a1 100644
--- a/tests/unit/components/DocumentationTopic/PrimaryContent/DeclarationDiff.spec.js
+++ b/tests/unit/components/DocumentationTopic/PrimaryContent/DeclarationDiff.spec.js
@@ -39,13 +39,11 @@ describe('DeclarationDiff', () => {
     expect(currentLists.at(0).props()).toEqual({
       declaration: propsData.changes.declaration.new[0],
       shouldCaption: true,
-      changeType: 'modified',
       declListExpanded: false,
     });
     expect(currentLists.at(1).props()).toEqual({
       declaration: propsData.changes.declaration.new[1],
       shouldCaption: true,
-      changeType: 'modified',
       declListExpanded: false,
     });
 
@@ -55,7 +53,6 @@ describe('DeclarationDiff', () => {
     expect(previousLists.at(0).props()).toEqual({
       declaration: propsData.changes.declaration.previous[0],
       shouldCaption: false, // false because we only have one declaration in the group
-      changeType: 'modified',
       declListExpanded: false,
     });
   });
diff --git a/tests/unit/components/DocumentationTopic/PrimaryContent/DeclarationGroup.spec.js b/tests/unit/components/DocumentationTopic/PrimaryContent/DeclarationGroup.spec.js
new file mode 100644
index 000000000..d33417e5e
--- /dev/null
+++ b/tests/unit/components/DocumentationTopic/PrimaryContent/DeclarationGroup.spec.js
@@ -0,0 +1,94 @@
+/**
+ * This source file is part of the Swift.org open source project
+ *
+ * Copyright (c) 2024 Apple Inc. and the Swift project authors
+ * Licensed under Apache License v2.0 with Runtime Library Exception
+ *
+ * See https://swift.org/LICENSE.txt for license information
+ * See https://swift.org/CONTRIBUTORS.txt for Swift project authors
+*/
+import DeclarationGroup from 'docc-render/components/DocumentationTopic/PrimaryContent/DeclarationGroup.vue';
+import { shallowMount } from '@vue/test-utils';
+import DeclarationSource
+  from 'docc-render/components/DocumentationTopic/PrimaryContent/DeclarationSource.vue';
+import { multipleLinesClass } from 'docc-render/constants/multipleLines';
+
+const propsData = {
+  declaration: {
+    platforms: ['iOS', 'tvOS', 'watchOS'],
+    tokens: [
+      { type: 'text', text: 'foo' },
+    ],
+  },
+  shouldCaption: true,
+  changeType: '',
+};
+
+const store = {
+  state: {
+    references: {
+      'doc://boo': { url: 'url-boo' },
+    },
+  },
+};
+
+const provide = {
+  interfaceLanguage: 'swift',
+  languages: new Set(['swift', 'occ']),
+  store,
+};
+
+describe('DeclarationGroup', () => {
+  let wrapper;
+
+  beforeEach(() => {
+    wrapper = shallowMount(DeclarationGroup, {
+      propsData,
+      provide,
+    });
+  });
+
+  it('renders a platforms label for each variant', () => {
+    const labels = wrapper.find('.platforms');
+    expect(labels.text()).toBe('iOS, tvOS, watchOS');
+  });
+
+  it('does not render a caption label if `shouldCaption` is false', () => {
+    wrapper = shallowMount(DeclarationGroup, {
+      propsData: {
+        ...propsData,
+        shouldCaption: false,
+      },
+      provide,
+    });
+
+    const labels = wrapper.find('.platforms');
+    expect(labels.exists()).toBe(false);
+  });
+
+  it('renders a `Source` for each variant', () => {
+    const source = wrapper.find(DeclarationSource);
+    expect(source.props('tokens')).toEqual(propsData.declaration.tokens);
+  });
+
+  it('renders the `Source`', () => {
+    const srcComponent = wrapper.find(DeclarationSource);
+    expect(srcComponent.props('language')).toEqual('swift');
+  });
+
+  it('applies the `multipleLinesClass` class if `displaysMultipleLinesAfterAPIChanges` is true', () => {
+    wrapper = shallowMount({
+      ...DeclarationGroup,
+      computed: {
+        ...DeclarationGroup.computed,
+        displaysMultipleLinesAfterAPIChanges: () => true,
+      },
+    },
+    {
+      propsData,
+      provide,
+    });
+
+    expect(wrapper.classes()).toContain(multipleLinesClass);
+  });
+});
diff --git a/tests/unit/components/DocumentationTopic/PrimaryContent/DeclarationList.spec.js b/tests/unit/components/DocumentationTopic/PrimaryContent/DeclarationList.spec.js
index 22603e9d1..8b7a0a439 100644
--- a/tests/unit/components/DocumentationTopic/PrimaryContent/DeclarationList.spec.js
+++ b/tests/unit/components/DocumentationTopic/PrimaryContent/DeclarationList.spec.js
@@ -1,7 +1,7 @@
 /**
  * This source file is part of the Swift.org open source project
  *
- * Copyright (c) 2021-2023 Apple Inc. and the Swift project authors
+ * Copyright (c) 2021-2024 Apple Inc. and the Swift project authors
  * Licensed under Apache License v2.0 with Runtime Library Exception
  *
  * See https://swift.org/LICENSE.txt for license information
@@ -10,10 +10,9 @@
 
 import DeclarationList from 'docc-render/components/DocumentationTopic/PrimaryContent/DeclarationList.vue';
 import { shallowMount } from '@vue/test-utils';
-import DeclarationSource
-  from 'docc-render/components/DocumentationTopic/PrimaryContent/DeclarationSource.vue';
+import DeclarationGroup
+  from 'docc-render/components/DocumentationTopic/PrimaryContent/DeclarationGroup.vue';
 import { waitFor } from 'docc-render/utils/loading';
-import { multipleLinesClass } from 'docc-render/constants/multipleLines';
 import { flushPromises } from '../../../../../test-utils';
 
 jest.mock('docc-render/utils/loading');
@@ -40,7 +39,7 @@ const basicDeclaration = {
 const propsData = {
   declaration: basicDeclaration,
   shouldCaption: true,
-  change: '',
+  changeType: '',
 };
 
 const withOtherDeclarations = {
@@ -65,8 +64,6 @@ const withOtherDeclarations = {
 
 const store = {
   state: {
-    onThisPageSections: [],
-    apiChanges: null,
     references: {
       'doc://boo': { url: 'url-boo' },
     },
@@ -74,9 +71,8 @@ const store = {
 };
 
 const provide = {
-  interfaceLanguage: 'swift',
-  languages: new Set(['swift', 'occ']),
   store,
+  identifier: 'doc://foo',
 };
 
 const createWrapper = options => shallowMount(DeclarationList, {
@@ -86,63 +82,15 @@ const createWrapper = options => shallowMount(DeclarationList, {
 });
 
 describe('DeclarationList', () => {
-  it('renders a platforms label for each variant', () => {
+  it('renders `DeclarationGroup` with correct prop', () => {
     const wrapper = createWrapper();
-
-    const labels = wrapper.find('.platforms');
-    expect(labels.text()).toBe('iOS, tvOS, watchOS');
-  });
-
-  it('does not render a caption label if `shouldCaption` is false', () => {
-    const wrapper = createWrapper({
-      propsData: {
-        ...propsData,
-        shouldCaption: false,
-      },
-    });
-
-    const labels = wrapper.find('.platforms');
-    expect(labels.exists()).toBe(false);
-  });
-
-  it('adds a declaration-group--changed class when there are changes', () => {
-    const wrapper = createWrapper({
-      propsData: {
-        ...propsData,
-        changeType: 'added',
-      },
+    const srcComponent = wrapper.find(DeclarationGroup);
+    expect(srcComponent.props('declaration')).toEqual({
+      ...propsData.declaration,
+      identifier: provide.identifier,
     });
-    expect(wrapper.classes()).toContain('declaration-group--changed');
-    expect(wrapper.classes()).toContain('declaration-group--added');
-  });
-
-  it('renders a `Source` for each variant', () => {
-    const wrapper = createWrapper();
-
-    const source = wrapper.find(DeclarationSource);
-    expect(source.props('tokens')).toEqual(propsData.declaration.tokens);
-  });
-
-  it('renders the `Source`', () => {
-    const wrapper = createWrapper();
-    const srcComponent = wrapper.find(DeclarationSource);
-    expect(srcComponent.props('language')).toEqual('swift');
-  });
-
-  it('applies the `multipleLinesClass` class if `displaysMultipleLinesAfterAPIChanges` is true', () => {
-    const wrapper = shallowMount({
-      ...DeclarationList,
-      computed: {
-        ...DeclarationList.computed,
-        displaysMultipleLinesAfterAPIChanges: () => true,
-      },
-    },
-    {
-      propsData,
-      provide,
-    });
-
-    expect(wrapper.classes()).toContain(multipleLinesClass);
+    expect(srcComponent.props('shouldCaption')).toEqual(propsData.shouldCaption);
+    expect(srcComponent.props('changeType')).toEqual(propsData.changeType);
   });
 });
 
@@ -160,19 +108,25 @@ describe('DeclarationList with otherDeclarations', () => {
     });
   });
 
-  it('renders only one `Source` when list is collapsed', () => {
+  it('renders only one `DeclarationGroup` when list is collapsed', () => {
     wrapper.setProps({ declListExpanded: false });
-    const sources = wrapper.findAll(DeclarationSource);
-    expect(sources.length).toBe(1);
-    expect(sources.at(0).props('tokens')).toEqual(withOtherDeclarations.declaration.tokens);
+    const groups = wrapper.findAll(DeclarationGroup);
+    expect(groups.length).toBe(1);
+    expect(groups.at(0).props('declaration')).toEqual({
+      tokens: basicDeclaration.tokens,
+      identifier: provide.identifier,
+    });
   });
 
-  it('renders one `Source` for each declaration in list in correct order when expanded', () => {
-    const sources = wrapper.findAll(DeclarationSource);
+  it('renders one `DeclarationGroup` for each declaration in list in correct order when expanded', () => {
+    const groups = wrapper.findAll(DeclarationGroup);
     // second item is the currently selected declaration
-    expect(sources.length).toBe(2);
-    expect(sources.at(0).props('tokens')).toEqual(withOtherDeclarations.declaration.otherDeclarations.declarations[0].tokens);
-    expect(sources.at(1).props('tokens')).toEqual(withOtherDeclarations.declaration.tokens);
+    expect(groups.length).toBe(2);
+    expect(groups.at(0).props('declaration')).toEqual(withOtherDeclarations.declaration.otherDeclarations.declarations[0]);
+    expect(groups.at(1).props('declaration')).toEqual({
+      tokens: basicDeclaration.tokens,
+      identifier: provide.identifier,
+    });
   });
 
   it('adds a `declaration-pill-expanded` class only when list is expanded', () => {
@@ -184,14 +138,14 @@ describe('DeclarationList with otherDeclarations', () => {
   });
 
   it('adds a `selected-declaration` class to the selected declaration', () => {
-    const sources = wrapper.findAll(DeclarationSource);
+    const declarations = wrapper.findAll('.declaration-pill');
     // second item is the currently selected declaration
-    expect(sources.at(0).classes()).not.toContain('selected-declaration');
-    expect(sources.at(1).classes()).toContain('selected-declaration');
+    expect(declarations.at(0).classes()).not.toContain('selected-declaration');
+    expect(declarations.at(1).classes()).toContain('selected-declaration');
   });
 
   it('renders a `div` for selected declaration, otherwise renders a `button`', () => {
-    const sourceWrapper = wrapper.findAll('.declaration-source-wrapper');
+    const sourceWrapper = wrapper.findAll('.declaration-group-wrapper');
     expect(sourceWrapper.at(0).find('div').exists()).toBe(false);
     expect(sourceWrapper.at(0).find('button').exists()).toBe(true);
     expect(sourceWrapper.at(1).find('div').exists()).toBe(true);
@@ -213,3 +167,77 @@ describe('DeclarationList with otherDeclarations', () => {
     expect(mocks.$router.push).toHaveBeenCalledWith(url);
   });
 });
+
+describe('DeclarationList with changes', () => {
+  it('renders `DeclarationGroup` with correct change type prop when no other declarations', () => {
+    const wrapper = createWrapper({
+      propsData: {
+        ...propsData,
+      },
+      provide,
+    });
+
+    wrapper.setProps({
+      changeType: 'added',
+    });
+    let declarationPill = wrapper.find('.declaration-pill');
+    expect(declarationPill.classes()).toContain('changed');
+    expect(declarationPill.classes()).toContain('changed-added');
+
+    wrapper.setProps({
+      changeType: 'deprecated',
+    });
+    declarationPill = wrapper.find('.declaration-pill');
+    expect(declarationPill.classes()).toContain('changed');
+    expect(declarationPill.classes()).toContain('changed-deprecated');
+
+    wrapper.setProps({
+      changeType: 'modified',
+    });
+    declarationPill = wrapper.find('.declaration-pill');
+    expect(declarationPill.classes()).toContain('changed');
+    expect(declarationPill.classes()).toContain('changed-modified');
+
+    const declarationGroup = declarationPill.find(DeclarationGroup);
+    expect(declarationGroup.props('declaration')).toEqual({
+      ...propsData.declaration,
+      identifier: provide.identifier,
+    });
+  });
+
+  it('renders 1 `DeclarationGroup` with correct change type prop when other declarations collapsed', () => {
+    const wrapper = createWrapper({
+      propsData: {
+        ...propsData,
+        ...withOtherDeclarations, // collapsed by default
+      },
+      provide,
+    });
+
+    wrapper.setProps({
+      changeType: 'added',
+    });
+    const declarationPills = wrapper.findAll('.declaration-pill');
+    expect(declarationPills.length).toBe(1);
+    expect(declarationPills.at(0).classes()).toContain('changed');
+    expect(declarationPills.at(0).classes()).toContain('changed-added');
+  });
+
+  it('renders the current symbol as a `DeclarationGroup` with correct change type prop when other declarations expanded', () => {
+    const wrapper = createWrapper({
+      propsData: {
+        ...propsData,
+        ...withOtherDeclarations,
+        declListExpanded: true,
+      },
+      provide,
+    });
+
+    wrapper.setProps({
+      changeType: 'added',
+    });
+    const declarationPills = wrapper.findAll('.declaration-pill');
+    expect(declarationPills.at(1).classes()).toContain('changed'); // current symbol is second in the list
+    expect(declarationPills.at(1).classes()).toContain('changed-added');
+  });
+});
diff --git a/tests/unit/components/DocumentationTopic/PrimaryContent/DeclarationSource.spec.js b/tests/unit/components/DocumentationTopic/PrimaryContent/DeclarationSource.spec.js
index 495adb3bd..5042b9f50 100644
--- a/tests/unit/components/DocumentationTopic/PrimaryContent/DeclarationSource.spec.js
+++ b/tests/unit/components/DocumentationTopic/PrimaryContent/DeclarationSource.spec.js
@@ -19,6 +19,7 @@ import Language from '@/constants/Language';
 import { flushPromises } from '../../../../../test-utils';
 
 const { Token, CodeBlock } = DeclarationSource.components;
+const { HighlightKind } = DeclarationSource.constants;
 const { TokenKind } = Token.constants;
 
 jest.mock('@/utils/indentation');
@@ -193,6 +194,20 @@ describe('DeclarationSource', () => {
       .toHaveBeenCalledWith(wrapper.find({ ref: 'code' }).vm.$el, Language.objectiveC.key.api);
     expect(callStack).toEqual(['indentDeclaration', 'displaysMultipleLines']);
   });
+
+  it('adds a "highlighted" class for tokens with `highlight="changed"`', () => {
+    expect(wrapper.findAll('.highlighted').length).toBe(0);
+
+    const tokensWithHighlights = [...propsData.tokens];
+    tokensWithHighlights[0].highlight = HighlightKind.changed;
+    tokensWithHighlights[2].highlight = HighlightKind.changed;
+    wrapper.setProps({ tokens: tokensWithHighlights });
+
+    const highlightedTokens = wrapper.findAll('.highlighted');
+    expect(highlightedTokens.length).toBe(2);
+    expect(highlightedTokens.at(0).props('text')).toBe(propsData.tokens[0].text);
+    expect(highlightedTokens.at(1).props('text')).toBe(propsData.tokens[2].text);
+  });
 });
 
 describe('Swift function/initializer formatting', () => {
diff --git a/tests/unit/components/DocumentationTopic/PrimaryContent/DeclarationToken/RawText.spec.js b/tests/unit/components/DocumentationTopic/PrimaryContent/DeclarationToken/RawText.spec.js
index c05276888..338202610 100644
--- a/tests/unit/components/DocumentationTopic/PrimaryContent/DeclarationToken/RawText.spec.js
+++ b/tests/unit/components/DocumentationTopic/PrimaryContent/DeclarationToken/RawText.spec.js
@@ -14,19 +14,8 @@ import RawText from 'docc-render/components/DocumentationTopic/PrimaryContent/De
 describe('RawText', () => {
   const propsData = { text: 'foo' };
 
-  it('renders a raw text node', () => {
+  it('renders a span', () => {
     const wrapper = shallowMount(RawText, { propsData });
-    expect(wrapper.find('span').exists()).toBe(false);
-    expect(wrapper.text()).toBe(propsData.text);
-  });
-
-  it('renders a span with the text if private Vue API is not available', () => {
-    const wrapper = shallowMount(RawText, {
-      propsData,
-      mocks: {
-        _v: undefined, // `this._v` is private Vue API
-      },
-    });
     expect(wrapper.is('span')).toBe(true);
     expect(wrapper.text()).toBe(propsData.text);
   });
diff --git a/tests/unit/components/DocumentationTopic/Relationships.spec.js b/tests/unit/components/DocumentationTopic/Relationships.spec.js
index 1798a7d8f..502942d18 100644
--- a/tests/unit/components/DocumentationTopic/Relationships.spec.js
+++ b/tests/unit/components/DocumentationTopic/Relationships.spec.js
@@ -1,7 +1,7 @@
 /**
  * This source file is part of the Swift.org open source project
  *
- * Copyright (c) 2021-2023 Apple Inc. and the Swift project authors
+ * Copyright (c) 2021-2024 Apple Inc. and the Swift project authors
  * Licensed under Apache License v2.0 with Runtime Library Exception
  *
  * See https://swift.org/LICENSE.txt for license information
@@ -79,6 +79,7 @@ describe('Relationships', () => {
     expect(table.props()).toEqual({
       anchor: 'relationships',
       title: 'sections.relationships',
+      enableMinimized: false,
     });
   });
 
diff --git a/tests/unit/components/Navigator.spec.js b/tests/unit/components/Navigator.spec.js
index f6a25d49b..fbfc42f94 100644
--- a/tests/unit/components/Navigator.spec.js
+++ b/tests/unit/components/Navigator.spec.js
@@ -17,6 +17,8 @@ import { INDEX_ROOT_KEY } from '@/constants/sidebar';
 
 jest.mock('docc-render/utils/throttle', () => jest.fn(v => v));
 
+const { LoadingNavigatorCard } = Navigator.components;
+
 const technology = {
   title: 'FooTechnology',
   children: [
@@ -161,6 +163,29 @@ describe('Navigator', () => {
     expect(wrapper.find('[aria-live="polite"]').text()).toBe('navigator.navigator-is navigator.state.loading');
   });
 
+  it('renders a LoadingNavigatorCard when navigator is loading', () => {
+    const wrapper = createWrapper({
+      propsData: {
+        isFetching: true,
+      },
+    });
+    expect(wrapper.find(LoadingNavigatorCard).exists()).toBe(true);
+  });
+
+  it('does not render a LoadingNavigatorCard when navigator is not loading', () => {
+    const wrapper = createWrapper();
+    expect(wrapper.find(LoadingNavigatorCard).exists()).toBe(false);
+  });
+
+  it('adds display:none to NavigatorCard when navigator is loading', () => {
+    const wrapper = createWrapper({
+      propsData: {
+        isFetching: true,
+      },
+    });
+    expect(wrapper.find(NavigatorCard).attributes('style')).toContain('display: none');
+  });
+
   it('renders an aria live that tells VO users when navigator is ready', () => {
     const wrapper = createWrapper();
     expect(wrapper.find('[aria-live="polite"]').exists()).toBe(true);
diff --git a/tests/unit/components/Navigator/NavigatorDataProvider.spec.js b/tests/unit/components/Navigator/NavigatorDataProvider.spec.js
index 34123d410..c502f37fe 100644
--- a/tests/unit/components/Navigator/NavigatorDataProvider.spec.js
+++ b/tests/unit/components/Navigator/NavigatorDataProvider.spec.js
@@ -10,6 +10,7 @@
 
 import NavigatorDataProvider from '@/components/Navigator/NavigatorDataProvider.vue';
 import { shallowMount } from '@vue/test-utils';
+import AppStore from 'docc-render/stores/AppStore';
 import Language from 'docc-render/constants/Language';
 import { TopicTypes } from '@/constants/TopicTypes';
 import { fetchIndexPathsData } from '@/utils/data';
@@ -112,11 +113,6 @@ const swiftIndexOne = {
   path: technologyUrl,
   children: [1, 2, 3],
 };
-const swiftIndexTwo = {
-  id: 'bar',
-  path: '/bar',
-  children: [1],
-};
 const objectiveCIndexOne = {
   id: 'foo-objc',
   path: technologyUrl,
@@ -127,11 +123,16 @@ const references = {
   foo: { bar: 'bar' },
 };
 
+const includedArchiveIdentifiers = [
+  'foo',
+  'bar',
+];
+
 const response = {
+  includedArchiveIdentifiers,
   interfaceLanguages: {
     [Language.swift.key.url]: [
       swiftIndexOne,
-      swiftIndexTwo,
     ],
     [Language.objectiveC.key.url]: [
       objectiveCIndexOne,
@@ -174,6 +175,10 @@ describe('NavigatorDataProvider', () => {
     jest.clearAllMocks();
   });
 
+  afterEach(() => {
+    AppStore.reset();
+  });
+
   it('fetches data when mounting NavigatorDataProvider', async () => {
     expect(fetchIndexPathsData).toHaveBeenCalledTimes(0);
     createWrapper();
@@ -285,7 +290,7 @@ describe('NavigatorDataProvider', () => {
     });
   });
 
-  it('returns undefined technology, if none matches', async () => {
+  it('returns the first technology, if none matches', async () => {
     createWrapper({
       propsData: {
         technologyUrl: '/documentation/bar',
@@ -297,8 +302,8 @@ describe('NavigatorDataProvider', () => {
       isFetchingAPIChanges: false,
       errorFetching: false,
       isFetching: false,
-      technology: undefined,
-      flatChildren: [],
+      technology: swiftIndexOne,
+      flatChildren,
       references,
     });
   });
@@ -552,4 +557,12 @@ describe('NavigatorDataProvider', () => {
       },
     ]);
   });
+
+  it('sets `includedArchiveIdentifiers` state in the app store', async () => {
+    expect(AppStore.state.includedArchiveIdentifiers).toEqual([]);
+    fetchIndexPathsData.mockResolvedValue(response);
+    createWrapper();
+    await flushPromises();
+    expect(AppStore.state.includedArchiveIdentifiers).toEqual(includedArchiveIdentifiers);
+  });
 });
diff --git a/tests/unit/mixins/metadata.spec.js b/tests/unit/mixins/metadata.spec.js
index c0ca21775..57e8a7b16 100644
--- a/tests/unit/mixins/metadata.spec.js
+++ b/tests/unit/mixins/metadata.spec.js
@@ -45,6 +45,9 @@ const createWrapper = ({
       disableMetadata: () => disableMetadata,
       pageTitle: () => title,
       pageDescription: () => description,
+      references: () => ({
+        'ref-d': { title: 'd' },
+      }),
     },
   }, {
     mocks: {
@@ -99,7 +102,11 @@ describe('metadata', () => {
             },
             {
               type: 'text',
-              text: ' c',
+              text: ' c ',
+            },
+            {
+              type: 'reference',
+              identifier: 'ref-d',
             },
           ],
         },
@@ -114,7 +121,7 @@ describe('metadata', () => {
         },
       ];
       const wrapper = createWrapper(pageData);
-      expect(wrapper.vm.extractFirstParagraphText(content)).toBe('a b c');
+      expect(wrapper.vm.extractFirstParagraphText(content)).toBe('a b c d');
       expect(wrapper.vm.extractFirstParagraphText([])).toBe('');
     });
   });
diff --git a/tests/unit/mixins/referencesProvider.spec.js b/tests/unit/mixins/referencesProvider.spec.js
new file mode 100644
index 000000000..c6e7512a0
--- /dev/null
+++ b/tests/unit/mixins/referencesProvider.spec.js
@@ -0,0 +1,121 @@
+/**
+ * This source file is part of the Swift.org open source project
+ *
+ * Copyright (c) 2024 Apple Inc. and the Swift project authors
+ * Licensed under Apache License v2.0 with Runtime Library Exception
+ *
+ * See https://swift.org/LICENSE.txt for license information
+ * See https://swift.org/CONTRIBUTORS.txt for Swift project authors
+*/
+import { shallowMount } from '@vue/test-utils';
+import referencesProvider from 'docc-render/mixins/referencesProvider';
+
+const FakeComponentInner = {
+  name: 'FakeComponentInner',
+  props: ['references'],
+  render() {
+    return null;
+  },
+};
+
+const FakeComponentOuter = {
+  name: 'FakeComponentOuter',
+  mixins: [referencesProvider],
+  render(createElement) {
+    return createElement(FakeComponentInner, {
+      props: {
+        references: this.references,
+      },
+    });
+  },
+};
+
+const aa = {
+  identifier: 'doc://A/documentation/A/a',
+  url: '/documentation/A/a',
+  title: 'A.A',
+};
+const ab = {
+  identifier: 'doc://A/documentation/A/b',
+  url: '/documentation/A/b',
+  title: 'A.B',
+};
+const bb = {
+  identifier: 'doc://B/documentation/B/b',
+  url: '/documentation/B/b',
+  title: 'B.B',
+};
+const bbb = {
+  identifier: 'doc://BB/documentation/BB/b',
+  url: '/documentation/BB/b',
+  title: 'BB.B',
+};
+
+const references = {
+  [aa.identifier]: aa,
+  [ab.identifier]: ab,
+  [bb.identifier]: bb,
+  [bbb.identifier]: bbb,
+};
+
+const provide = {
+  store: {
+    state: { references },
+  },
+};
+
+const createOuter = (opts = { provide }) => shallowMount(FakeComponentOuter, opts);
+
+describe('referencesProvider', () => {
+  it('provides a store with a default state', () => {
+    const outer = createOuter({});
+    const inner = outer.find(FakeComponentInner);
+    expect(inner.exists()).toBe(true);
+    expect(inner.props('references')).toEqual({});
+  });
+
+  it('provides references from a store', () => {
+    const outer = createOuter();
+    const inner = outer.find(FakeComponentInner);
+    expect(inner.exists()).toBe(true);
+    expect(inner.props('references')).toEqual(references);
+  });
+
+  it('removes `url` data for refs with non-empty `includedArchiveIdentifiers` app state', () => {
+    // empty `includedArchiveIdentifiers` — no changes to refs
+    const outer = createOuter();
+    let inner = outer.find(FakeComponentInner);
+    expect(inner.exists()).toBe(true);
+    expect(inner.props('references')).toEqual(references);
+
+    // `includedArchiveIdentifiers` contains all refs - no changes to refs
+    outer.setData({
+      appState: {
+        includedArchiveIdentifiers: ['A', 'B', 'BB'],
+      },
+    });
+    inner = outer.find(FakeComponentInner);
+    expect(inner.exists()).toBe(true);
+    expect(inner.props('references')).toEqual(references);
+
+    // `includedArchiveIdentifiers` only contains archive B — remove `url` field
+    // from all non-B refs
+    outer.setData({
+      appState: {
+        includedArchiveIdentifiers: ['B'],
+      },
+    });
+    inner = outer.find(FakeComponentInner);
+    expect(inner.exists()).toBe(true);
+    const refs3 = inner.props('references');
+    expect(refs3).not.toEqual(references);
+    expect(refs3[aa.identifier].title).toBe(aa.title);
+    expect(refs3[aa.identifier].url).toBeFalsy(); // aa `url` is gone now
+    expect(refs3[ab.identifier].title).toBe(ab.title);
+    expect(refs3[ab.identifier].url).toBeFalsy(); // ab `url` is gone now
+    expect(refs3[bb.identifier].title).toBe(bb.title);
+    expect(refs3[bb.identifier].url).toBe(bb.url); // bb still has `url`
+    expect(refs3[bbb.identifier].title).toBe(bbb.title);
+    expect(refs3[bbb.identifier].url).toBeFalsy(); // bbb `url` is gone now
+  });
+});
diff --git a/tests/unit/setup-utils/SwiftDocCRenderRouter.spec.js b/tests/unit/setup-utils/SwiftDocCRenderRouter.spec.js
index ab0c73927..5d6df4b34 100644
--- a/tests/unit/setup-utils/SwiftDocCRenderRouter.spec.js
+++ b/tests/unit/setup-utils/SwiftDocCRenderRouter.spec.js
@@ -168,10 +168,10 @@ describe('SwiftDocCRenderRouter', () => {
 
       expect(resolve('/documentation/foo').name).toBe(route);
       expect(resolve('/documentation/bar').name).toBe(route);
-      expect(resolve('/documentation/foobar').params.pathMatch).toBe('foobar');
+      expect(resolve('/documentation/foobar').params.pathMatch).toBe('/foobar');
 
       expect(resolve('/documentation/tutorials').name).toBe(route);
-      expect(resolve('/documentation/tutorials').params.pathMatch).toBe('tutorials');
+      expect(resolve('/documentation/tutorials').params.pathMatch).toBe('/tutorials');
     });
 
     it('resolves paths to the "documentation-topic-locale" route', () => {
@@ -180,17 +180,17 @@ describe('SwiftDocCRenderRouter', () => {
       expect(resolve('/en-US/documentation/foo').name).toBe(route);
       expect(resolve('/en-US/documentation/foo').params).toEqual({
         locale: 'en-US',
-        pathMatch: 'foo',
+        pathMatch: '/foo',
       });
       expect(resolve('/ja-JP/documentation/bar').name).toBe(route);
       expect(resolve('/ja-JP/documentation/bar').params).toEqual({
         locale: 'ja-JP',
-        pathMatch: 'bar',
+        pathMatch: '/bar',
       });
       expect(resolve('/zh-CN/documentation/baz').name).toBe(route);
       expect(resolve('/zh-CN/documentation/baz/qux').params).toEqual({
         locale: 'zh-CN',
-        pathMatch: 'baz/qux',
+        pathMatch: '/baz/qux',
       });
     });
   });
diff --git a/tests/unit/stores/AppStore.spec.js b/tests/unit/stores/AppStore.spec.js
index e961c1e55..aae3cc65c 100644
--- a/tests/unit/stores/AppStore.spec.js
+++ b/tests/unit/stores/AppStore.spec.js
@@ -22,6 +22,7 @@ describe('AppStore', () => {
       systemColorScheme: ColorScheme.light,
       preferredLocale: null,
       availableLocales: [],
+      includedArchiveIdentifiers: [],
     });
   });
 
@@ -37,6 +38,7 @@ describe('AppStore', () => {
       systemColorScheme: ColorScheme.light,
       preferredLocale: null,
       availableLocales: [],
+      includedArchiveIdentifiers: [],
     });
 
     // restore target
@@ -72,11 +74,20 @@ describe('AppStore', () => {
     });
   });
 
+  describe('setIncludedArchiveIdentifiers', () => {
+    it('sets the included archive identifiers', () => {
+      const includedArchiveIdentifiers = ['foo', 'bar'];
+      AppStore.setIncludedArchiveIdentifiers(includedArchiveIdentifiers);
+      expect(AppStore.state.includedArchiveIdentifiers).toEqual(includedArchiveIdentifiers);
+    });
+  });
+
   it('resets the state', () => {
     AppStore.setImageLoadingStrategy(ImageLoadingStrategy.eager);
     AppStore.setPreferredColorScheme(ColorScheme.auto);
     AppStore.setSystemColorScheme(ColorScheme.dark);
     AppStore.syncPreferredColorScheme();
+    AppStore.setIncludedArchiveIdentifiers(['a']);
     AppStore.reset();
 
     expect(AppStore.state).toEqual({
@@ -86,6 +97,7 @@ describe('AppStore', () => {
       systemColorScheme: ColorScheme.light,
       preferredLocale: null,
       availableLocales: [],
+      includedArchiveIdentifiers: [],
     });
   });
 });
diff --git a/tests/unit/utils/indentation.spec.js b/tests/unit/utils/indentation.spec.js
index 7548636a8..37d42258a 100644
--- a/tests/unit/utils/indentation.spec.js
+++ b/tests/unit/utils/indentation.spec.js
@@ -59,5 +59,16 @@ describe('indentDeclaration', () => {
         expect(code.innerHTML).toEqual(originalCode);
       });
     });
+
+    describe('with a C++ function that has namespaced parameters', () => {
+      it('should not add indentation', () => {
+        const originalCode = '<a href="/documentation/mycppclass" class="type-identifier-link"><code><span>MyCPPClass</span></code></a><span class="token-identifier">operator+</span>(<span class="token-identifier">std</span>::<span class="type-identifier-link"><span>string</span></span> <span class="token-internalParam">other</span>);';
+
+        const code = prepare(originalCode);
+        indentDeclaration(code, 'occ');
+
+        expect(code.innerHTML).toEqual(originalCode);
+      });
+    });
   });
 });
diff --git a/tests/unit/views/DocumentationTopic.spec.js b/tests/unit/views/DocumentationTopic.spec.js
index bc320e0dc..b0f141a43 100644
--- a/tests/unit/views/DocumentationTopic.spec.js
+++ b/tests/unit/views/DocumentationTopic.spec.js
@@ -261,7 +261,7 @@ describe('DocumentationTopic', () => {
 
     wrapper.setData({ topicData });
 
-    const title = wrapper.find('span.nav-title');
+    const title = wrapper.find('h2.nav-title');
     expect(title.exists()).toBe(true);
     expect(title.text()).toBe('documentation.title');
   });