commit d75c8284643cb8bb7b822e5296d49228e77e60fa Merge: 325a6dfe f8a5f734 Author: Michael Jumper <mjumper@apache.org> Date: Thu Aug 6 16:29:41 2026 -0700 Merge 1.6.1 changes back to patch.