diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.html b/src/app/access-control/epeople-registry/epeople-registry.component.html
index c2f3c0db047..d19230e5e48 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.component.html
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.html
@@ -26,7 +26,7 @@ <h2 id="search" class="border-bottom pb-2">
         </div>
         <div class="flex-grow-1 mr-3 ml-3">
           <div class="form-group input-group">
-            <label id="query" for="query" class="sr-only">{{labelPrefix + 'search.placeholder' | translate}}</label>
+            <label id="query-label" for="query" class="sr-only">{{labelPrefix + 'search.placeholder' | translate}}</label>
             <input type="text" name="query" id="query" formControlName="query"
                    class="form-control" [attr.aria-label]="labelPrefix + 'search.placeholder' | translate"
                    [placeholder]="(labelPrefix + 'search.placeholder' | translate)">
diff --git a/src/app/bitstream-page/bitstream-page.resolver.ts b/src/app/bitstream-page/bitstream-page.resolver.ts
index db2af2d5542..9c09d19ac13 100644
--- a/src/app/bitstream-page/bitstream-page.resolver.ts
+++ b/src/app/bitstream-page/bitstream-page.resolver.ts
@@ -12,7 +12,8 @@ import { getFirstCompletedRemoteData } from '../core/shared/operators';
  * Requesting them as embeds will limit the number of requests
  */
  export const BITSTREAM_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Bitstream>[] = [
-  followLink('bundle', {}, followLink('primaryBitstream'), followLink('item')),
+  followLink('bundle', {}, followLink('item')),
+  followLink('bundle', {}, followLink('primaryBitstream')),
   followLink('format')
 ];
 
diff --git a/src/app/item-page/clarin-ref-featured-services/clarin-ref-featured-services.component.html b/src/app/item-page/clarin-ref-featured-services/clarin-ref-featured-services.component.html
index a4adbef4397..1f019c9cad9 100644
--- a/src/app/item-page/clarin-ref-featured-services/clarin-ref-featured-services.component.html
+++ b/src/app/item-page/clarin-ref-featured-services/clarin-ref-featured-services.component.html
@@ -13,7 +13,7 @@
       </div>
 
       <div class="d-flex align-items-start clarin-ref-box-footer-services pt-1">
-        <div class="btn-group pr-2" ngbDropdown *ngFor="let featuredService of (featuredServices | async)">
+        <div class="btn-group pr-2" ngbDropdown *ngFor="let featuredService of (featuredServices | async); let i = index">
           <a class="btn btn-danger clarin-ref-box-services-button"
              type="button"
              target="_blank"
@@ -22,13 +22,13 @@
           </a>
           <button type="button"
                   class="btn btn-danger dropdown-toggle dropdown-toggle-split clarin-ref-box-services-button"
-                  id="resultdropdown"
+                  id="resultdropdown-{{ i }}"
                   ngbDropdownToggle
                   data-bs-toggle="dropdown"
                   aria-haspopup="true"
                   aria-expanded="false">
           </button>
-          <div ngbDropdownMenu aria-labelledby="resultdropdown" class="lindat-dropdown-menu">
+          <div ngbDropdownMenu [attr.aria-labelledby]="'resultdropdown-' + i" class="lindat-dropdown-menu">
             <a
               class="dropdown-item"
               target="_blank"
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
index b414e7e5d5b..947d501dfa0 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
@@ -15,19 +15,19 @@
              [attr.aria-label]="'item.edit.bitstreams.bundle.table.aria-label' | translate: { bundle: bundleName } ">
         <thead [class.visually-hidden]="!isFirstTable">
         <tr class="header-row font-weight-bold">
-          <th id="name" scope="col" class="{{ columnSizes.columns[0].buildClasses() }}">
+          <th id="name-{{ sanitizedBundleName }}" scope="col" class="{{ columnSizes.columns[0].buildClasses() }}">
             {{'item.edit.bitstreams.headers.name' | translate}}
           </th>
-          <th id="description" scope="col" class="{{ columnSizes.columns[1].buildClasses() }}">
+          <th id="description-{{ sanitizedBundleName }}" scope="col" class="{{ columnSizes.columns[1].buildClasses() }}">
             {{'item.edit.bitstreams.headers.description' | translate}}
           </th>
-          <th id="format" scope="col" class="{{ columnSizes.columns[2].buildClasses() }}">
+          <th id="format-{{ sanitizedBundleName }}" scope="col" class="{{ columnSizes.columns[2].buildClasses() }}">
             {{'item.edit.bitstreams.headers.format' | translate}}
           </th>
-          <th id="actions" scope="col" class="{{ columnSizes.columns[3].buildClasses() }} text-center">
+          <th id="actions-{{ sanitizedBundleName }}" scope="col" class="{{ columnSizes.columns[3].buildClasses() }} text-center">
             {{'item.edit.bitstreams.headers.actions' | translate}}
           </th>
-          <th id="synchronized" scope="col" class="{{ columnSizes.columns[4].buildClasses() }} text-center">
+          <th id="synchronized-{{ sanitizedBundleName }}" scope="col" class="{{ columnSizes.columns[4].buildClasses() }} text-center">
             {{'item.edit.bitstreams.headers.synchronized' | translate}}
           </th>
         </tr>
@@ -50,19 +50,19 @@
               </button>
               <div ngbDropdown #paginationControls="ngbDropdown" class="btn-group float-right btn-sm p-0"
                    placement="bottom-right">
-                <button class="btn btn-outline-secondary" id="paginationControls" ngbDropdownToggle
+                <button class="btn btn-outline-secondary" id="paginationControls-bundle-{{ sanitizedBundleName }}" ngbDropdownToggle
                         [title]="'pagination.options.description' | translate"
                         [attr.aria-label]="'pagination.options.description' | translate" aria-haspopup="true"
                         aria-expanded="false">
                   <i class="fas fa-cog" aria-hidden="true"></i>
                 </button>
 
-                <ul id="paginationControlsDropdownMenu" aria-labelledby="paginationControls" role="menu"
+                <ul id="paginationControlsDropdownMenu-bundle-{{ sanitizedBundleName }}" [attr.aria-labelledby]="'paginationControls-bundle-' + sanitizedBundleName" role="menu"
                     ngbDropdownMenu>
                   <li role="menuitem">
-                    <span class="dropdown-header" id="pagination-control_results-per-page"
+                    <span class="dropdown-header" id="pagination-control_results-per-page-bundle-{{ sanitizedBundleName }}"
                           role="heading">{{ 'pagination.results-per-page' | translate}}</span>
-                    <ul aria-labelledby="pagination-control_results-per-page" class="list-unstyled" role="listbox">
+                    <ul [attr.aria-labelledby]="'pagination-control_results-per-page-bundle-' + sanitizedBundleName" class="list-unstyled" role="listbox">
                       <li *ngFor="let size of paginationOptions.pageSizeOptions" role="option"
                           [attr.aria-selected]="size === (pageSize$ | async)">
                         <button (click)="doPageSizeChange(size)" class="dropdown-item">
@@ -85,7 +85,7 @@
               (cdkDragStarted)="dragStart()" (cdkDragEnded)="dragEnd()">
 
             <th class="bitstream-name row-element {{ columnSizes.columns[0].buildClasses() }}"
-                scope="row" id="{{ entry.nameStripped }}" headers="{{ bundleName }} name">
+                scope="row" id="{{ entry.nameStripped }}" headers="{{ bundleName }} name-{{ sanitizedBundleName }}">
                 <div class="drag-handle text-muted float-left p-1 mr-2" tabindex="0" cdkDragHandle
                      (keydown.enter)="select($event, entry)" (keydown.space)="select($event, entry)" (click)="select($event, entry)">
                   <i class="fas fa-grip-vertical fa-fw"
@@ -94,15 +94,15 @@
                 <span class="dont-break-out">{{ entry.name }}</span>
             </th>
             <td class="row-element {{ columnSizes.columns[1].buildClasses() }}"
-                headers="{{ entry.nameStripped }} {{ bundleName }} description">
+                headers="{{ entry.nameStripped }} {{ bundleName }} description-{{ sanitizedBundleName }}">
               <span class="dont-break-out">{{ entry.description }}</span>
             </td>
             <td class="row-element {{ columnSizes.columns[2].buildClasses() }}"
-                headers="{{ entry.nameStripped }} {{ bundleName }} format">
+                headers="{{ entry.nameStripped }} {{ bundleName }} format-{{ sanitizedBundleName }}">
               <span class="dont-break-out">{{ (entry.format | async)?.shortDescription }}</span>
             </td>
             <td class="row-element {{ columnSizes.columns[3].buildClasses() }}"
-                headers="{{ entry.nameStripped }} {{ bundleName }} actions">
+                headers="{{ entry.nameStripped }} {{ bundleName }} actions-{{ sanitizedBundleName }}">
               <div class="text-center w-100">
                 <div class="btn-group relationship-action-buttons">
                   <a [href]="entry.downloadUrl"
@@ -133,7 +133,7 @@
               </div>
             </td>
             <td class="{{columnSizes.columns[4].buildClasses()}} row-element"
-                headers="{{ entry.nameStripped }} {{ bundleName }} synchronized">
+                headers="{{ entry.nameStripped }} {{ bundleName }} synchronized-{{ sanitizedBundleName }}">
               <div class="d-flex align-items-center justify-content-center">
                 <span class="text-center">
                   <i [class]="isBitstreamSynchronized(entry) ? 'fas fa-check' : 'fas fa-times'"></i>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
index 31d819c4322..4512963f982 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
@@ -107,6 +107,12 @@ export class ItemEditBitstreamBundleComponent implements OnInit, OnDestroy {
    */
   bundleName: string;
 
+  /**
+   * Sanitized bundle name (whitespace removed) for use in HTML element IDs.
+   * HTML IDs cannot contain spaces, so this ensures valid id/headers/aria-labelledby tokens.
+   */
+  sanitizedBundleName: string;
+
   /**
    * The number of bitstreams in the bundle
    */
@@ -189,6 +195,7 @@ export class ItemEditBitstreamBundleComponent implements OnInit, OnDestroy {
     this.viewContainerRef.createEmbeddedView(this.bundleView);
     this.itemPageRoute = getItemPageRoute(this.item);
     this.bundleName = this.dsoNameService.getName(this.bundle);
+    this.sanitizedBundleName = this.bundleName.replace(/\s+/g, '');
     this.bundleUrl = this.bundle.self;
 
     this.initializePagination();
diff --git a/src/app/item-page/simple/field-components/clarin-sponsor-item-field/clarin-sponsor-item-field.component.html b/src/app/item-page/simple/field-components/clarin-sponsor-item-field/clarin-sponsor-item-field.component.html
index 7afa7185cb2..9c21ea02b71 100644
--- a/src/app/item-page/simple/field-components/clarin-sponsor-item-field/clarin-sponsor-item-field.component.html
+++ b/src/app/item-page/simple/field-components/clarin-sponsor-item-field/clarin-sponsor-item-field.component.html
@@ -1,16 +1,16 @@
 <div *ngVar="item?.allMetadataValues('local.sponsor') as sponsorMvs">
-  <div *ngFor="let sponsor of sponsorMvs; let lastItem = last">
+  <div *ngFor="let sponsor of sponsorMvs; let i = index; let lastItem = last">
     <div *ngVar="sponsor?.split(SPONSOR_VALUE_SEPARATOR) as sponsorMetadataValueParts">
       <div class="sponsor-padding">
-        <span id="organization-value">{{ getValueOrError(sponsorMetadataValueParts?.[2], ORGANIZATION_ERROR) }}</span>
+        <span id="organization-value-{{ i }}">{{ getValueOrError(sponsorMetadataValueParts?.[2], ORGANIZATION_ERROR) }}</span>
       </div>
       <div class="sponsor-padding">
         <span>{{ 'item.page.acknowledgement.project-code' | translate }}</span>
-        <span id="project-code-value" class="pl-1">{{ getValueOrError(sponsorMetadataValueParts?.[1], PROJECT_CODE_ERROR) }}</span>
+        <span id="project-code-value-{{ i }}" class="pl-1">{{ getValueOrError(sponsorMetadataValueParts?.[1], PROJECT_CODE_ERROR) }}</span>
       </div>
       <div class="sponsor-padding">
         <span>{{ 'item.page.acknowledgement.project-name' | translate }}</span>
-        <span id="project-name-value" class="pl-1">{{ getValueOrError(sponsorMetadataValueParts?.[3], PROJECT_NAME_ERROR) }}</span>
+        <span id="project-name-value-{{ i }}" class="pl-1">{{ getValueOrError(sponsorMetadataValueParts?.[3], PROJECT_NAME_ERROR) }}</span>
       </div>
       <div *ngIf="!lastItem" class="pb-3"></div>
     </div>
diff --git a/src/app/item-page/simple/field-components/clarin-sponsor-item-field/clarin-sponsor-item-field.component.spec.ts b/src/app/item-page/simple/field-components/clarin-sponsor-item-field/clarin-sponsor-item-field.component.spec.ts
index 4d226d0d55d..ce5d65053df 100644
--- a/src/app/item-page/simple/field-components/clarin-sponsor-item-field/clarin-sponsor-item-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/clarin-sponsor-item-field/clarin-sponsor-item-field.component.spec.ts
@@ -41,9 +41,9 @@ describe('ClarinSponsorItemFieldComponent', () => {
     component.item = mockItemWithMetadataFieldsAndValue(['local.sponsor'], EU_FUND);
     fixture.detectChanges();
 
-    expect(fixture.debugElement.query(By.css('#organization-value')).nativeElement.textContent).toContain(ORGANIZATION);
-    expect(fixture.debugElement.query(By.css('#project-code-value')).nativeElement.textContent).toContain(PROJECT_CODE);
-    expect(fixture.debugElement.query(By.css('#project-name-value')).nativeElement.textContent).toContain(PROJECT_NAME);
+    expect(fixture.debugElement.query(By.css('#organization-value-0')).nativeElement.textContent).toContain(ORGANIZATION);
+    expect(fixture.debugElement.query(By.css('#project-code-value-0')).nativeElement.textContent).toContain(PROJECT_CODE);
+    expect(fixture.debugElement.query(By.css('#project-name-value-0')).nativeElement.textContent).toContain(PROJECT_NAME);
   });
 
   it('should render national fund', () => {
@@ -54,8 +54,8 @@ describe('ClarinSponsorItemFieldComponent', () => {
 
     component.item = mockItemWithMetadataFieldsAndValue(['local.sponsor'], NATIONAL_FUND) as any;
     fixture.detectChanges();
-    expect(fixture.debugElement.query(By.css('#organization-value')).nativeElement.textContent).toContain(ORGANIZATION);
-    expect(fixture.debugElement.query(By.css('#project-code-value')).nativeElement.textContent).toContain(PROJECT_CODE);
-    expect(fixture.debugElement.query(By.css('#project-name-value')).nativeElement.textContent).toContain(PROJECT_NAME);
+    expect(fixture.debugElement.query(By.css('#organization-value-0')).nativeElement.textContent).toContain(ORGANIZATION);
+    expect(fixture.debugElement.query(By.css('#project-code-value-0')).nativeElement.textContent).toContain(PROJECT_CODE);
+    expect(fixture.debugElement.query(By.css('#project-name-value-0')).nativeElement.textContent).toContain(PROJECT_NAME);
   });
 });
diff --git a/src/app/item-page/simple/field-components/preview-section/file-description/file-tree-view/file-tree-view.component.html b/src/app/item-page/simple/field-components/preview-section/file-description/file-tree-view/file-tree-view.component.html
index 2b82e44760f..0f352b4f13a 100644
--- a/src/app/item-page/simple/field-components/preview-section/file-description/file-tree-view/file-tree-view.component.html
+++ b/src/app/item-page/simple/field-components/preview-section/file-description/file-tree-view/file-tree-view.component.html
@@ -11,7 +11,7 @@
 
   <ng-template #fileTemplate>
     <i class="far fa-file fa-sm pr-1" style="color: #a0a0a0"></i>
-    <span id="folderName">{{ node.name }}</span>
+    <span>{{ node.name }}</span>
     <span class="size pull-right">{{ node.size }}</span>
   </ng-template>
 
diff --git a/src/app/item-page/simple/field-components/preview-section/file-description/file-tree-view/file-tree-view.component.spec.ts b/src/app/item-page/simple/field-components/preview-section/file-description/file-tree-view/file-tree-view.component.spec.ts
index 1ffa042a5a6..022753f3efc 100644
--- a/src/app/item-page/simple/field-components/preview-section/file-description/file-tree-view/file-tree-view.component.spec.ts
+++ b/src/app/item-page/simple/field-components/preview-section/file-description/file-tree-view/file-tree-view.component.spec.ts
@@ -46,7 +46,7 @@ describe('FileTreeViewComponent', () => {
 
   it('should display the node name', () => {
     waitForAsync(() => {
-      const nodeNameElement = fixture.debugElement.query(By.css('#folderName')).nativeElement;
+      const nodeNameElement = fixture.debugElement.query(By.css('span')).nativeElement;
       expect(nodeNameElement.textContent).toContain('TestFolder');
     });
   });
diff --git a/src/app/shared/ds-select/ds-select.component.html b/src/app/shared/ds-select/ds-select.component.html
index e87b7c5cc6c..c336e9323b7 100644
--- a/src/app/shared/ds-select/ds-select.component.html
+++ b/src/app/shared/ds-select/ds-select.component.html
@@ -3,13 +3,13 @@
   <div ngbDropdown class="btn-group" (openChange)="toggled.emit($event)">
 
     <div class="input-group-prepend" *ngIf="label">
-      <span id="dsSelectMenuLabel" class="input-group-text">
+      <span id="dsSelectMenuLabel-{{ uniqueId }}" class="input-group-text">
         {{ label | translate }}
       </span>
     </div>
 
-    <button aria-describedby="dsSelectMenuLabel"
-            id="dsSelectMenuButton"
+    <button [attr.aria-describedby]="label ? 'dsSelectMenuLabel-' + uniqueId : null"
+            id="dsSelectMenuButton-{{ uniqueId }}"
             class="btn btn-outline-primary selection"
             (blur)="close.emit($event)"
             (click)="close.emit($event)"
@@ -20,8 +20,8 @@
 
     <div ngbDropdownMenu
          class="dropdown-menu"
-         id="dsSelectDropdownMenu"
-         aria-labelledby="dsSelectMenuButton">
+         id="dsSelectDropdownMenu-{{ uniqueId }}"
+         [attr.aria-labelledby]="'dsSelectMenuButton-' + uniqueId">
       <div>
         <ng-content select=".menu"></ng-content>
       </div>
diff --git a/src/app/shared/ds-select/ds-select.component.ts b/src/app/shared/ds-select/ds-select.component.ts
index 26d1560c019..d0a8d41d1e4 100644
--- a/src/app/shared/ds-select/ds-select.component.ts
+++ b/src/app/shared/ds-select/ds-select.component.ts
@@ -1,5 +1,7 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
 
+let nextDsSelectId = 0;
+
 /**
  * Component which represent a DSpace dropdown selector.
  */
@@ -10,6 +12,11 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
 })
 export class DsSelectComponent {
 
+  /**
+   * Unique identifier for the component instance.
+   */
+  uniqueId = `ds-select-${nextDsSelectId++}`;
+
   /**
    * An optional label for the dropdown selector.
    */
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
index 606db29db37..9e73b55f751 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
@@ -3,7 +3,7 @@
      [formGroup]="group"
      [ngClass]="[getClass('element', 'container'), getClass('grid', 'container')]">
   <label *ngIf="!isCheckbox && hasLabel"
-         [id]="'label_' + model.id"
+         [id]="'label_' + id"
          [for]="id"
          [innerHTML]="(model.required && model.label) ? (model.label | translate) + ' *' : (model.label | translate)"
          [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]"></label>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
index 355e10b9a09..bb6f33c290f 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
@@ -377,4 +377,78 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
     expect(testFn(formModel[25])).toEqual(DsDynamicFormGroupComponent);
   });
 
+  describe('unique id generation', () => {
+    afterEach(() => {
+      DsDynamicFormControlContainerComponent.resetIdCounters();
+    });
+
+    it('should return the base element ID for the first instance of a given id', () => {
+      // testModel (formModel[8]) has id 'input' — first instance keeps original
+      expect(component.id).toBe(component.model.id);
+    });
+
+    it('should return a suffixed ID for the second instance of the same base id', () => {
+      // Simulate two separate container instances with the same base id.
+      // The first call to the getter registers 'input' → suffix 0 (original).
+      expect(component.id).toBe('input');
+
+      // Create a second component-like access: directly exercise the getter
+      // on a fresh component that shares the same model id.
+      const secondComponent = Object.create(component);
+      secondComponent._cachedId = undefined;
+      secondComponent._baseId = undefined;
+      // model with the same id but a new instance
+      secondComponent.model = new DynamicInputModel({ id: 'input' });
+      expect(secondComponent.id).toBe('input_1');
+    });
+
+    it('should not interfere between different base ids', () => {
+      expect(component.id).toBe('input'); // registers 'input'
+
+      const otherComponent = Object.create(component);
+      otherComponent._cachedId = undefined;
+      otherComponent._baseId = undefined;
+      otherComponent.model = new DynamicInputModel({ id: 'email' });
+      expect(otherComponent.id).toBe('email'); // first 'email' → original
+    });
+
+    it('should return the same id on repeated access (idempotent)', () => {
+      const first = component.id;
+      const second = component.id;
+      expect(first).toBe(second);
+    });
+
+    it('should remove the id state entry so the next instance reuses the base id', () => {
+      expect(component.id).toBe('input');
+
+      // Destroy the only active instance — state entry should be deleted
+      component.ngOnDestroy();
+      // A new component with the same base id should receive the original base id (no suffix)
+      const newComponent = Object.create(component);
+      newComponent._cachedId = undefined;
+      newComponent._baseId = undefined;
+      newComponent.model = new DynamicInputModel({ id: 'input' });
+      expect(newComponent.id).toBe('input');
+    });
+
+    it('should keep the id state entry when other instances with the same base id are still active', () => {
+      // Register two instances with the same base id
+      expect(component.id).toBe('input');
+
+      const secondComponent = Object.create(component);
+      secondComponent._cachedId = undefined;
+      secondComponent._baseId = undefined;
+      secondComponent.model = new DynamicInputModel({ id: 'input' });
+      expect(secondComponent.id).toBe('input_1');
+
+      component.ngOnDestroy();// destroy only the first instance
+      // A third component with the same base id should still get a suffixed id
+      const thirdComponent = Object.create(component);
+      thirdComponent._cachedId = undefined;
+      thirdComponent._baseId = undefined;
+      thirdComponent.model = new DynamicInputModel({ id: 'input' });
+      expect(thirdComponent.id).toBe('input_2');
+    });
+  });
+
 });
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
index f2ea9c3baf2..15ca2912e0b 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
@@ -210,6 +210,16 @@ export function dsDynamicFormControlMapFn(model: DynamicFormControlModel): Type<
   changeDetection: ChangeDetectionStrategy.Default
 })
 export class DsDynamicFormControlContainerComponent extends DynamicFormControlContainerComponent implements OnInit, OnChanges, OnDestroy {
+
+  /**
+   * Tracks per-baseId state for unique ID generation.
+   * nextSuffix: the next numeric suffix to assign (0 means keep original ID).
+   * activeCount: number of live component instances using this baseId
+   *   — when it drops to 0 the entry is removed so that a later page visit
+   *     starts fresh.
+   */
+  private static _idState = new Map<string, { nextSuffix: number; activeCount: number }>();
+
   @ContentChildren(DynamicTemplateDirective) contentTemplateList: QueryList<DynamicTemplateDirective>;
   // eslint-disable-next-line @angular-eslint/no-input-rename
   @Input('templates') inputTemplateList: QueryList<DynamicTemplateDirective>;
@@ -254,6 +264,35 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
    */
   fetchThumbnail: boolean;
 
+  private _cachedId: string;
+  private _baseId: string;
+
+  /**
+   * Returns a unique element ID for this component instance.
+   * The first instance of every base ID keeps the original value;
+   * subsequent instances get a numeric suffix (_1, _2, …).
+   */
+  get id(): string {
+    if (!this._cachedId) {
+      this._baseId = this.layoutService.getElementId(this.model);
+      const state = DsDynamicFormControlContainerComponent._idState.get(this._baseId)
+        || { nextSuffix: 0, activeCount: 0 };
+      this._cachedId = state.nextSuffix === 0 ? this._baseId : `${this._baseId}_${state.nextSuffix}`;
+      state.nextSuffix++;
+      state.activeCount++;
+      DsDynamicFormControlContainerComponent._idState.set(this._baseId, state);
+    }
+    return this._cachedId;
+  }
+
+  /**
+   * Clears the global ID counter state.  Used in tests to prevent
+   * state leaking between test cases.
+   */
+  static resetIdCounters(): void {
+    DsDynamicFormControlContainerComponent._idState.clear();
+  }
+
   get componentType(): Type<DynamicFormControl> | null {
     return dsDynamicFormControlMapFn(this.model);
   }
@@ -403,6 +442,24 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
         (instance as any).formModel = this.formModel;
         (instance as any).formGroup = this.formGroup;
       }
+
+      // When this container's unique ID differs from the base model ID
+      // (i.e., this is a duplicate instance), propagate the suffixed ID
+      // to the child form control component so that the rendered element
+      // id matches the container's label[for].
+      //
+      // Object.defineProperty is used because child components from the
+      // third-party @ng-dynamic-forms library expose `id` as a getter
+      // on the prototype; an instance-level property takes precedence.
+      if (this.componentRef?.instance) {
+        if (this.id !== this._baseId) {
+          const uniqueId = this.id;
+          Object.defineProperty(this.componentRef.instance, 'id', {
+            get: () => uniqueId,
+            configurable: true,
+          });
+        }
+      }
     }
   }
 
@@ -499,9 +556,19 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
   }
 
   /**
-   * Unsubscribe from all subscriptions
+   * Unsubscribe from all subscriptions and clean up the ID counter
+   * for this instance's base ID.
    */
   ngOnDestroy(): void {
+    if (this._baseId) {
+      const state = DsDynamicFormControlContainerComponent._idState.get(this._baseId);
+      if (state) {
+        state.activeCount--;
+        if (state.activeCount <= 0) {
+          DsDynamicFormControlContainerComponent._idState.delete(this._baseId);
+        }
+      }
+    }
     this.subs
       .filter((sub) => hasValue(sub))
       .forEach((sub) => sub.unsubscribe());
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
index 9fe6e37c9e3..97b29c5f14c 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
@@ -6,7 +6,7 @@
                                [workflowItem]="workflowitem$.value"></ds-themed-item-list-preview>
   <div class="row">
     <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2 pl-3' : ''">
-      <ds-pool-task-actions id="actions"
+      <ds-pool-task-actions id="actions-{{ dso?.id }}"
                             [item]="item$.value"
                             [object]="dso"
                             [workflowitem]="workflowitem$.value"
diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html
index d7fdb62c5ac..249668ccbe5 100644
--- a/src/app/shared/pagination/pagination.component.html
+++ b/src/app/shared/pagination/pagination.component.html
@@ -7,11 +7,11 @@
       </div>
       <div class="col">
         <div *ngIf="!hideGear" ngbDropdown #paginationControls="ngbDropdown" placement="bottom-right" class="d-inline-block float-right">
-          <button class="btn btn-secondary" id="paginationControls" ngbDropdownToggle [title]="'pagination.options.description' | translate" [attr.aria-label]="'pagination.options.description' | translate" aria-haspopup="true" aria-expanded="false" role="button" tabindex="0"><i class="fas fa-cog" aria-hidden="true"></i></button>
-          <ul id="paginationControlsDropdownMenu" aria-labelledby="paginationControls" role="menu" ngbDropdownMenu>
+          <button class="btn btn-secondary" id="paginationControls-{{ id }}" ngbDropdownToggle [title]="'pagination.options.description' | translate" [attr.aria-label]="'pagination.options.description' | translate" aria-haspopup="true" aria-expanded="false" role="button" tabindex="0"><i class="fas fa-cog" aria-hidden="true"></i></button>
+          <ul id="paginationControlsDropdownMenu-{{ id }}" [attr.aria-labelledby]="'paginationControls-' + id" role="menu" ngbDropdownMenu>
             <li role="menuitem">
-              <span class="dropdown-header" id="pagination-control_results-per-page" role="heading">{{ 'pagination.results-per-page' | translate}}</span>
-              <ul aria-labelledby="pagination-control_results-per-page" class="list-unstyled" role="listbox">
+              <span class="dropdown-header" id="pagination-control_results-per-page-{{ id }}" role="heading">{{ 'pagination.results-per-page' | translate}}</span>
+              <ul [attr.aria-labelledby]="'pagination-control_results-per-page-' + id" class="list-unstyled" role="listbox">
                 <li *ngFor="let item of pageSizeOptions" role="option" [attr.aria-selected]="item === (pageSize$ | async)">
                   <button (click)="doPageSizeChange(item)" class="dropdown-item" role="button" tabindex="0">
                     <i [ngClass]="{'invisible': item !== (pageSize$ | async) }" class="fas fa-check" aria-hidden="true"></i> {{item}}
@@ -20,8 +20,8 @@
               </ul>
             </li>
             <li role="menuitem">
-              <span class="dropdown-header" id="pagination-control_sort-direction" role="heading">{{ 'pagination.sort-direction' | translate}}</span>
-              <ul aria-labelledby="pagination-control_sort-direction" class="list-unstyled" role="listbox">
+              <span class="dropdown-header" id="pagination-control_sort-direction-{{ id }}" role="heading">{{ 'pagination.sort-direction' | translate}}</span>
+              <ul [attr.aria-labelledby]="'pagination-control_sort-direction-' + id" class="list-unstyled" role="listbox">
                 <li *ngFor="let direction of (sortDirections | dsKeys)" [attr.aria-selected]="direction.value === (sortDirection$ | async)" role="option">
                   <button class="dropdown-item" (click)="doSortDirectionChange(direction.value)" role="button" tabindex="0">
                     <i [ngClass]="{'invisible': direction.value !== (sortDirection$ |async)}" class="fas fa-check" aria-hidden="true"></i> {{'sorting.' + direction.key | translate}}
@@ -54,12 +54,12 @@
     </div>
 
     <div *ngIf="!showPaginator" class="d-flex justify-content-between">
-        <button id="nav-prev" type="button" class="btn btn-outline-primary float-left"
+        <button id="nav-prev-{{ id }}" type="button" class="btn btn-outline-primary float-left"
                 (click)="goPrev()"
                 [dsBtnDisabled]="(objects?.payload?.currentPage <= 1) && (paginationOptions?.currentPage <= 1)" role="button" tabindex="0">
           <i class="fas fa-angle-left"></i> {{'pagination.previous.button' |translate}}
         </button>
-      <button id="nav-next" type="button" class="btn btn-outline-primary float-right"
+      <button id="nav-next-{{ id }}" type="button" class="btn btn-outline-primary float-right"
               (click)="goNext()"
               [dsBtnDisabled]="(objects?.payload?.currentPage >= objects?.payload?.totalPages) || (paginationOptions?.currentPage >= objects?.payload?.totalPages)" role="button" tabindex="0">
           <span [ngbTooltip]="objects?.payload?.currentPage >= objects?.payload?.totalPages ? ('pagination.next.button.disabled.tooltip' |translate) : null">
diff --git a/src/app/shared/pagination/pagination.component.spec.ts b/src/app/shared/pagination/pagination.component.spec.ts
index 30ace4b2b9b..4442bfec81c 100644
--- a/src/app/shared/pagination/pagination.component.spec.ts
+++ b/src/app/shared/pagination/pagination.component.spec.ts
@@ -68,11 +68,11 @@ function expectPages(fixture: ComponentFixture<any>, pagesDef: string[]): void {
 }
 
 function changePageSize(fixture: ComponentFixture<any>, pageSize: string): void {
-  const buttonEl = fixture.nativeElement.querySelector('#paginationControls');
+  const buttonEl = fixture.nativeElement.querySelector('[id^="paginationControls-"]');
 
   buttonEl.click();
 
-  const dropdownMenu = fixture.debugElement.query(By.css('#paginationControlsDropdownMenu'));
+  const dropdownMenu = fixture.debugElement.query(By.css('[id^="paginationControlsDropdownMenu-"]'));
   const buttons = dropdownMenu.nativeElement.querySelectorAll('button');
 
   for (const button of buttons) {
@@ -340,7 +340,7 @@ describe('Pagination component', () => {
       });
 
       it('should call goPrev method', () => {
-        const prev = testFixture.debugElement.query(By.css('#nav-prev'));
+        const prev = testFixture.debugElement.query(By.css('[id^="nav-prev-"]'));
         testFixture.detectChanges();
         prev.triggerEventHandler('click', null);
         expect(testComp.goPrev).toHaveBeenCalled();
@@ -354,7 +354,7 @@ describe('Pagination component', () => {
       });
 
       it('should call goNext method', () => {
-        const next = testFixture.debugElement.query(By.css('#nav-next'));
+        const next = testFixture.debugElement.query(By.css('[id^="nav-next-"]'));
         testFixture.detectChanges();
         next.triggerEventHandler('click', null);
         expect(testComp.goNext).toHaveBeenCalled();
@@ -363,13 +363,13 @@ describe('Pagination component', () => {
 
     describe('check for prev and next button', () => {
       it('shoud have a previous button', () => {
-        const prev = testFixture.debugElement.query(By.css('#nav-prev'));
+        const prev = testFixture.debugElement.query(By.css('[id^="nav-prev-"]'));
         testFixture.detectChanges();
         expect(prev).toBeTruthy();
       });
 
       it('shoud have a next button', () => {
-        const next = testFixture.debugElement.query(By.css('#nav-next'));
+        const next = testFixture.debugElement.query(By.css('[id^="nav-next-"]'));
         testFixture.detectChanges();
         expect(next).toBeTruthy();
       });
diff --git a/src/app/static-page/static-page.component.spec.ts b/src/app/static-page/static-page.component.spec.ts
index 0c461042381..69d65248509 100644
--- a/src/app/static-page/static-page.component.spec.ts
+++ b/src/app/static-page/static-page.component.spec.ts
@@ -60,7 +60,7 @@ describe('StaticPageComponent', () => {
 
   it('should rewrite OAI link with rest.baseUrl', async () => {
     const oaiHtml = '<a href="/server/oai/request?verb=ListSets">OAI</a>';
-    const { fixture, component } = await setupTest(oaiHtml, 'https://api.example.org/rest');
+    const { fixture, component } = await setupTest(oaiHtml, 'https://api.example.org/server');
 
     await component.ngOnInit();
     fixture.detectChanges();
@@ -83,18 +83,31 @@ describe('StaticPageComponent', () => {
 
   it('should avoid double slashes when rest.baseUrl ends with slash', async () => {
     const oaiHtml = '<a href="/server/oai/request?verb=ListRecords">OAI</a>';
-    const { fixture, component } = await setupTest(oaiHtml, 'https://api.example.org/rest/');
+    const { fixture, component } = await setupTest(oaiHtml, 'https://api.example.org/server/');
 
     await component.ngOnInit();
     fixture.detectChanges();
 
     expect(component.htmlContent.value).toContain('https://api.example.org/server/oai/request?verb=ListRecords');
-    expect(component.htmlContent.value).not.toContain('//server');
+    expect(component.htmlContent.value).not.toContain('//oai');
+  });
+
+  it('should include namespace in OAI link when rest.baseUrl has namespace prefix', async () => {
+    const oaiHtml = '<a href="/server/oai/request?verb=ListMetadataFormats">full list</a>';
+    const { fixture, component } = await setupTest(oaiHtml, 'https://api.example.org/repository/server');
+
+    await component.ngOnInit();
+    fixture.detectChanges();
+
+    const rewritten = 'https://api.example.org/repository/server/oai/request?verb=ListMetadataFormats';
+    expect(component.htmlContent.value).toContain(rewritten);
+    const anchor = fixture.nativeElement.querySelector('a');
+    expect(anchor.getAttribute('href')).toBe(rewritten);
   });
 
   it('should leave content unchanged when no OAI link is present', async () => {
     const otherHtml = '<a href="/server/other">Other</a>';
-    const { fixture, component } = await setupTest(otherHtml, 'https://api.example.org/rest');
+    const { fixture, component } = await setupTest(otherHtml, 'https://api.example.org/server');
 
     await component.ngOnInit();
     fixture.detectChanges();
diff --git a/src/app/static-page/static-page.component.ts b/src/app/static-page/static-page.component.ts
index aff3eed0aed..018ed5d8cf5 100644
--- a/src/app/static-page/static-page.component.ts
+++ b/src/app/static-page/static-page.component.ts
@@ -31,7 +31,7 @@ export class StaticPageComponent implements OnInit {
     let htmlContent = await this.htmlContentService.getHmtlContentByPathAndLocale(this.htmlFileName);
     if (isNotEmpty(htmlContent)) {
       const restBase = this.appConfig?.rest?.baseUrl;
-      const oaiUrl = restBase ? new URL('/server/oai', restBase).href : '/server/oai';
+      const oaiUrl = restBase ? restBase.replace(/\/+$/, '') + '/oai' : '/server/oai';
       htmlContent = htmlContent.replace(/href="\/server\/oai/gi, 'href="' + oaiUrl);
 
       this.htmlContent.next(htmlContent);
diff --git a/src/app/statistics/angulartics/dspace/view-tracker-resolver.service.spec.ts b/src/app/statistics/angulartics/dspace/view-tracker-resolver.service.spec.ts
new file mode 100644
index 00000000000..d1b598c7025
--- /dev/null
+++ b/src/app/statistics/angulartics/dspace/view-tracker-resolver.service.spec.ts
@@ -0,0 +1,144 @@
+import { ViewTrackerResolverService } from './view-tracker-resolver.service';
+import { Angulartics2 } from 'angulartics2';
+import { ReferrerService } from '../../../core/services/referrer.service';
+import { ActivatedRouteSnapshot, ResolveEnd, RouterStateSnapshot } from '@angular/router';
+import { of as observableOf, Subject } from 'rxjs';
+
+describe('ViewTrackerResolverService', () => {
+  let service: ViewTrackerResolverService;
+  let angulartics2: Angulartics2;
+  let referrerService: jasmine.SpyObj<ReferrerService>;
+  let router: any;
+  let routerEvents$: Subject<any>;
+  let mockDso: { firstMetadataValue: jasmine.Spy };
+
+  const mockReferrer = 'https://www.referrer.com';
+
+  beforeEach(() => {
+    routerEvents$ = new Subject();
+    mockDso = {
+      firstMetadataValue: jasmine.createSpy('firstMetadataValue').and.returnValue('http://hdl.handle.net/123456789/1'),
+    };
+
+    angulartics2 = {
+      eventTrack: new Subject(),
+    } as any;
+
+    referrerService = jasmine.createSpyObj('ReferrerService', ['getReferrer']);
+    referrerService.getReferrer.and.returnValue(observableOf(mockReferrer));
+
+    router = {
+      events: routerEvents$.asObservable(),
+    };
+
+    service = new ViewTrackerResolverService(angulartics2, referrerService, router);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+
+  it('should include dc_identifier in event properties when dso has dc.identifier.uri metadata', () => {
+    const routeSnapshot = {
+      data: {
+        dso: {
+          payload: mockDso,
+        },
+      },
+    } as any as ActivatedRouteSnapshot;
+    const stateSnapshot = {} as RouterStateSnapshot;
+
+    let emittedEvent: any;
+    (angulartics2.eventTrack as Subject<any>).subscribe(event => {
+      emittedEvent = event;
+    });
+
+    service.resolve(routeSnapshot, stateSnapshot);
+
+    // Simulate ResolveEnd event to trigger the subscription
+    routerEvents$.next(new ResolveEnd(1, '/', '/', {} as any));
+
+    expect(emittedEvent).toBeDefined();
+    expect(emittedEvent.action).toBe('page_view');
+    expect(emittedEvent.properties.object).toBe(mockDso);
+    expect(emittedEvent.properties.referrer).toBe(mockReferrer);
+    expect(emittedEvent.properties.dc_identifier).toBe('http://hdl.handle.net/123456789/1');
+    expect(mockDso.firstMetadataValue).toHaveBeenCalledWith('dc.identifier.uri');
+  });
+
+  it('should set dc_identifier to undefined when dso does not have dc.identifier.uri metadata', () => {
+    const mockDsoWithoutMetadata = {
+      firstMetadataValue: jasmine.createSpy('firstMetadataValue').and.returnValue(undefined),
+    };
+
+    const routeSnapshot = {
+      data: {
+        dso: {
+          payload: mockDsoWithoutMetadata,
+        },
+      },
+    } as any as ActivatedRouteSnapshot;
+    const stateSnapshot = {} as RouterStateSnapshot;
+
+    let emittedEvent: any;
+    (angulartics2.eventTrack as Subject<any>).subscribe(event => {
+      emittedEvent = event;
+    });
+
+    service.resolve(routeSnapshot, stateSnapshot);
+    routerEvents$.next(new ResolveEnd(1, '/', '/', {} as any));
+
+    expect(emittedEvent).toBeDefined();
+    expect(emittedEvent.action).toBe('page_view');
+    expect(emittedEvent.properties.dc_identifier).toBeUndefined();
+  });
+
+  it('should handle missing dso gracefully (dc_identifier undefined)', () => {
+    const routeSnapshot = {
+      data: {
+        dso: {
+          payload: undefined,
+        },
+      },
+    } as any as ActivatedRouteSnapshot;
+    const stateSnapshot = {} as RouterStateSnapshot;
+
+    let emittedEvent: any;
+    (angulartics2.eventTrack as Subject<any>).subscribe(event => {
+      emittedEvent = event;
+    });
+
+    service.resolve(routeSnapshot, stateSnapshot);
+    routerEvents$.next(new ResolveEnd(1, '/', '/', {} as any));
+
+    expect(emittedEvent).toBeDefined();
+    expect(emittedEvent.action).toBe('page_view');
+    expect(emittedEvent.properties.dc_identifier).toBeUndefined();
+  });
+
+  it('should use custom dsoPath from route data when provided', () => {
+    const mockDsoCustom = {
+      firstMetadataValue: jasmine.createSpy('firstMetadataValue').and.returnValue('http://hdl.handle.net/custom/42'),
+    };
+
+    const routeSnapshot = {
+      data: {
+        dsoPath: 'myCustomDso',
+        myCustomDso: mockDsoCustom,
+      },
+    } as any as ActivatedRouteSnapshot;
+    const stateSnapshot = {} as RouterStateSnapshot;
+
+    let emittedEvent: any;
+    (angulartics2.eventTrack as Subject<any>).subscribe(event => {
+      emittedEvent = event;
+    });
+
+    service.resolve(routeSnapshot, stateSnapshot);
+    routerEvents$.next(new ResolveEnd(1, '/', '/', {} as any));
+
+    expect(emittedEvent).toBeDefined();
+    expect(emittedEvent.properties.object).toBe(mockDsoCustom);
+    expect(emittedEvent.properties.dc_identifier).toBe('http://hdl.handle.net/custom/42');
+  });
+});
diff --git a/src/app/statistics/angulartics/dspace/view-tracker-resolver.service.ts b/src/app/statistics/angulartics/dspace/view-tracker-resolver.service.ts
index fc23c09c51f..40afc6d2c5c 100644
--- a/src/app/statistics/angulartics/dspace/view-tracker-resolver.service.ts
+++ b/src/app/statistics/angulartics/dspace/view-tracker-resolver.service.ts
@@ -29,11 +29,14 @@ export class ViewTrackerResolverService {
       switchMap(() =>
         this.referrerService.getReferrer().pipe(take(1))))
       .subscribe((referrer: string) => {
+        const object = this.getNestedProperty(routeSnapshot.data, dsoPath);
+        const dc_identifier = object?.firstMetadataValue?.('dc.identifier.uri');
         this.angulartics2.eventTrack.next({
           action: 'page_view',
           properties: {
-            object: this.getNestedProperty(routeSnapshot.data, dsoPath),
+            object,
             referrer,
+            dc_identifier,
           },
         });
       });
diff --git a/src/app/submission/sections/clarin-license-resource/section-license.component.html b/src/app/submission/sections/clarin-license-resource/section-license.component.html
index 9ed6b046259..31e671a0187 100644
--- a/src/app/submission/sections/clarin-license-resource/section-license.component.html
+++ b/src/app/submission/sections/clarin-license-resource/section-license.component.html
@@ -68,7 +68,7 @@
                   *ngFor="let license of filteredLicenses4Selector"
                   (click)="selectLicense(license.id)"
                   [value]="license.id"
-                  id="license_option">
+                  [id]="'license_option_' + license.id">
                 <span [class]="'label label-default label-' + license.licenseLabel">{{license.licenseLabel}}</span>
                 <b class="pl-1">{{license.name}}</b>
               </li>
diff --git a/src/test.ts b/src/test.ts
index 2f07cf0d1da..c401ca80eb7 100644
--- a/src/test.ts
+++ b/src/test.ts
@@ -8,6 +8,9 @@ import {
   platformBrowserDynamicTesting
 } from '@angular/platform-browser-dynamic/testing';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import {
+  DsDynamicFormControlContainerComponent
+} from './app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component';
 
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
@@ -21,4 +24,6 @@ jasmine.getEnv().afterEach(() => {
   getTestBed().inject(MockStore, null)?.resetSelectors();
   // Close any leftover modals
   getTestBed().inject(NgbModal, null)?.dismissAll?.();
+  // Reset unique-ID counters so state does not leak between test cases
+  DsDynamicFormControlContainerComponent.resetIdCounters();
 });