Partial backport of platform PR #7435#7685

labkey-jeckels wants to merge 1 commit into

release25.11-SNAPSHOTLabKey/platform:release25.11-SNAPSHOTfrom

25.11_fb_7435_backportLabKey/platform:25.11_fb_7435_backportCopy head branch name to clipboard