From bcff32d47addc91e724627daf851d5600c832bf9 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Mon, 13 Apr 2026 16:04:37 -0700
Subject: [PATCH 1/3] GH Issue 1051: ensure audit comments carry through after
 processing per-line storage comments

---
 experiment/src/org/labkey/experiment/ExpDataIterators.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/experiment/src/org/labkey/experiment/ExpDataIterators.java b/experiment/src/org/labkey/experiment/ExpDataIterators.java
index b14dacc468e..8ffcd234d3c 100644
--- a/experiment/src/org/labkey/experiment/ExpDataIterators.java
+++ b/experiment/src/org/labkey/experiment/ExpDataIterators.java
@@ -3165,6 +3165,10 @@ private TypeData createSampleHeaderRow(ExpSampleTypeImpl sampleType, Container c
             validFields.add("Storage Unit Label");
             // For consistency with other storage fields that are imported without spaces in the names
             validFields.add("EnteredStorage");
+            validFields.add("StorageComment"); // GH Issue 1051
+            validFields.add("Storage Comment");
+            validFields.add("StorageLocation");
+            validFields.add("Storage Location");
             List<Integer> fieldIndexes = new IntArrayList();
             Map<Integer, String> dependencyIndexes = new IntHashMap<>();
             List<String> header = new ArrayList<>();

From f1e19305b1614b9099ed18f566024c0afcff8777 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Mon, 13 Apr 2026 16:07:13 -0700
Subject: [PATCH 2/3] Update wording on PR tasks

---
 .github/pull_request_template.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 961f9495a36..8a67c0fb3b0 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -10,6 +10,6 @@
 <!-- list of standard tasks (remove this comment to enable)
 #### Tasks 📍
 - [ ] Manual Testing
-- [ ] Needs Automation
+- [ ] Test Automation
 - [ ] Verify Fix
--->
\ No newline at end of file
+-->

From 7452584879672cc6a575656a6ccc12c001af6575 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Mon, 13 Apr 2026 16:30:22 -0700
Subject: [PATCH 3/3] StorageLocation is already in the map

---
 experiment/src/org/labkey/experiment/ExpDataIterators.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/experiment/src/org/labkey/experiment/ExpDataIterators.java b/experiment/src/org/labkey/experiment/ExpDataIterators.java
index 8ffcd234d3c..96cd1f66a90 100644
--- a/experiment/src/org/labkey/experiment/ExpDataIterators.java
+++ b/experiment/src/org/labkey/experiment/ExpDataIterators.java
@@ -3167,8 +3167,6 @@ private TypeData createSampleHeaderRow(ExpSampleTypeImpl sampleType, Container c
             validFields.add("EnteredStorage");
             validFields.add("StorageComment"); // GH Issue 1051
             validFields.add("Storage Comment");
-            validFields.add("StorageLocation");
-            validFields.add("Storage Location");
             List<Integer> fieldIndexes = new IntArrayList();
             Map<Integer, String> dependencyIndexes = new IntHashMap<>();
             List<String> header = new ArrayList<>();