Partial backport of platform PR #7435#7686

labkey-jeckels wants to merge 1 commit into

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

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