Merge discvr-25.7 to develop#273

bbimber merged 2 commits intodevelopLabKey/LabDevKitModules:developfrom

fb_merge_25.7_to_developLabKey/LabDevKitModules:fb_merge_25.7_to_developCopy head branch name to clipboard