commit 8e219475e10a8432b732cd0cb5085a99483fdd81 Merge: 8141f38d 0e34b9a0 Author: Michael Jumper <mjumper@apache.org> Date: Thu Apr 16 10:11:37 2026 -0700 Merge 1.6.1 changes back to patch.