Merge hotfix into main to ensure parity

[lindseyburnett]

Summary

• Merge hotfix branch into main to ensure hotfix changes are preserved
• Prevents hotfix changes from being lost or reverted as main progresses

Details

This PR synchronizes changes from the hotfix branch to ensure that all fixes and updates deployed via hotfix are properly integrated into the main branch. Without this sync, ongoing development in main could inadvertently revert or conflict with production hotfixes.

git checkout hotfix
git pull
git checkout main
git pull
git checkout -b lburnett/hotfix_sync
git merge --no-ff hotfix

[github-actions]

⛏️ Workflow Run

🧹 Checkstyle

🧪 JUnit

	Tests	Passed ✅	Skipped ⚠️	Failed
JUnit Test Report	1915 ran	1910 passed	5 skipped	0 failed

Details

Test	Result
No test annotations available

---

[lindseyburnett]

/retest