From f69ed71a08687b6e7a25d781658b530d0448c2d1 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Mon, 2 Jun 2025 12:07:07 -0700
Subject: [PATCH 1/2] Issue 53153: support "RowId" as value for "AliquotedFrom"

---
 .../components/src/internal/components/editable/models.ts     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/components/src/internal/components/editable/models.ts b/packages/components/src/internal/components/editable/models.ts
index 2856b175c0..41f1210584 100644
--- a/packages/components/src/internal/components/editable/models.ts
+++ b/packages/components/src/internal/components/editable/models.ts
@@ -338,8 +338,8 @@ export class EditorModel
             if (renderer?.getEditableRawValue) {
                 row = row.set(col.name, renderer.getEditableRawValue(values));
             } else if (col.isLookup()) {
-                if (col.isExpInput() || col.isAliquotParent()) {
-                    // We have to use display values for ExpInput and AliquotParent because of name expressions
+                if (col.isExpInput()) {
+                    // We have to use display values for ExpInput because of name expressions
                     row = row.set(
                         col.name,
                         values

From 86d2b11ee741487a8febf9b326ce03c3c41959fb Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Mon, 23 Jun 2025 12:39:38 -0700
Subject: [PATCH 2/2] 6.51.1-fb-alias-merge.0

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 0cc7ff7f30..f3f15337d7 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "6.51.0",
+  "version": "6.51.1-fb-alias-merge.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "6.51.0",
+      "version": "6.51.1-fb-alias-merge.0",
       "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 d3e622694c..e7a9814a1b 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "6.51.0",
+  "version": "6.51.1-fb-alias-merge.0",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [