commit e85cba26b742bf80e7af34050d71795504762f20 Merge: fd6e2574 0d378678 Author: Michael Jumper <mjumper@apache.org> Date: Fri Mar 27 23:51:00 2026 -0700 Merge 1.6.1 changes back to patch.