commit 6c073afc09a4210c7a8ff54e48b6992cacdf5022 Merge: 772a65a3 389c1198 Author: Michael Jumper <mjumper@apache.org> Date: Sun Mar 15 11:12:12 2026 -0700 Merge changes from patch branch back to main.