commit 95f24ddfd2f7865e2e67f20d0d3505a0bc8cba20 Merge: 7989c397 e08efde3 Author: Michael Jumper <mjumper@apache.org> Date: Sun Apr 5 23:14:35 2026 -0700 Merge changes from patch branch back to main.