[bot] Merge 25.12 to develop (Conflicts)

[github-actions]

Automatic merge failed! Please merge 25.12 into fb_bot_merge_25.12 and resolve conflicts manually.

git fetch
git checkout fb_bot_merge_25.12
git reset --hard origin/develop
git merge 26d69a3b00458ae95f99093b76ea8cf9f348621c -m "Merge 25.12 to develop"

Resolve all conflicts (using IntelliJ or git mergetool)

git commit
git push --force

Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
Verify all PRs before approving: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=fb_bot_merge_25.12