commit 2980cf071b98e8084949c2d4c5013cdd27b255c8 Merge: 4df878ad e85cba26 Author: Michael Jumper <mjumper@apache.org> Date: Fri Mar 27 23:51:01 2026 -0700 Merge changes from patch branch back to main.