commit 7d867258865ffcb81046deffc45a130715a5d270 Merge: 2980cf07 157080ea Author: Michael Jumper <mjumper@apache.org> Date: Tue Mar 31 14:59:19 2026 -0700 Merge changes from patch branch back to main.