commit 4df878ad2394635d2c57d7a937bc6abea27fd9f9 Merge: 7a52821c fd6e2574 Author: Michael Jumper <mjumper@apache.org> Date: Fri Mar 27 13:42:47 2026 -0700 Merge changes from patch branch back to main.