commit 01734a39fc013910b937a738a0a92846a53c005d Merge: d69b3dc0 336d5e80 Author: Michael Jumper <mjumper@apache.org> Date: Tue Jul 28 01:57:16 2026 -0700 Merge 1.6.1 changes back to patch.