diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 22b4492a37..d1e5af2dfb 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "6.58.5",
+  "version": "6.58.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "6.58.5",
+      "version": "6.58.6",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index bad15f8b9f..b4493de8f6 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "6.58.5",
+  "version": "6.58.6",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [
diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md
index 536af3663c..eea89a45eb 100644
--- a/packages/components/releaseNotes/components.md
+++ b/packages/components/releaseNotes/components.md
@@ -1,6 +1,11 @@
 # @labkey/components
 Components, models, actions, and utility functions for LabKey applications and pages
 
+### version 6.58.6
+*Released*: 26 August 2025
+- Merge from release25.7-SNAPSHOT to develop
+    - includes changes from 6.53.4 #1843
+
 ### version 6.58.5
 *Released*: 14 August 2025
 - Issue 52026 and 51862: Reduce the logging for calculated expression column SQL errors
@@ -80,6 +85,11 @@ Components, models, actions, and utility functions for LabKey applications and p
 - ProductMenu shows 'Dashboard' instead of 'Storage' as subtitle in FM /home route
 - Issue 53371: Find Samples by ID JS error when clicking "Find Samples" button without entering anything into the text area
 
+### version 6.53.4
+*Released*: 21 August 2025
+- SamplesAPIWrapper: add sort arg to getSelectionLineageData
+  - Issue 53702: Selection order is not retained when editing multiple samples in grid
+
 ### version 6.53.3
 *Released*: 7 July 2025
 - Issue 53394: FileInput revert removal of the "-fileUpload" suffix from inputId
diff --git a/packages/components/src/internal/components/samples/APIWrapper.ts b/packages/components/src/internal/components/samples/APIWrapper.ts
index 54596a5e00..3df0c6d019 100644
--- a/packages/components/src/internal/components/samples/APIWrapper.ts
+++ b/packages/components/src/internal/components/samples/APIWrapper.ts
@@ -79,7 +79,8 @@ export interface SamplesAPIWrapper {
         schema: string,
         query: string,
         viewName: string,
-        columns?: string[]
+        columns: string[] | undefined,
+        sort: string | undefined
     ) => Promise<ISelectRowsResult>;
 
     getTimelineEvents: (sampleId: number, timezone?: string) => Promise<TimelineEventModel[]>;
diff --git a/packages/components/src/internal/components/samples/actions.ts b/packages/components/src/internal/components/samples/actions.ts
index 632b6ffae7..27e40cc8da 100644
--- a/packages/components/src/internal/components/samples/actions.ts
+++ b/packages/components/src/internal/components/samples/actions.ts
@@ -201,20 +201,22 @@ export function getSelectionLineageData(
     schema: string,
     query: string,
     viewName: string,
-    extraColumns: string[] = []
+    extraColumns: string[] = [],
+    sort: string | undefined
 ): Promise<ISelectRowsResult> {
     if (selections?.size === 0) return Promise.reject('No data is selected.');
     const rowIds = Array.from(selections).map(s => parseInt(s, 10));
 
     return selectRowsDeprecated({
-        schemaName: schema,
-        queryName: query,
-        viewName,
         columns: List.of('RowId', 'Name', 'LSID', 'Folder')
             .concat(ParentEntityLineageColumns)
             .toArray()
             .concat(extraColumns),
         filterArray: [Filter.create('RowId', rowIds, Filter.Types.IN)],
+        queryName: query,
+        schemaName: schema,
+        sort,
+        viewName,
     });
 }