commit fd6e25742750ffe14ad2b25c1f4bea977289c642 Merge: d019f32f 31c3ee15 Author: Michael Jumper <mjumper@apache.org> Date: Fri Mar 27 13:42:47 2026 -0700 Merge 1.6.1 changes back to patch.