commit caa265482e74c796e20239ea3c71668a63cb1cfd Merge: c419e148 77816f6a Author: Michael Jumper <mjumper@apache.org> Date: Tue Jan 6 17:09:57 2026 -0800 Merge 1.6.1 changes back to patch.