commit 8c70ec3c57fe7012132f02fed968b6050bdaffc9 Merge: 932704fc 46f9f685 Author: Michael Jumper <mjumper@apache.org> Date: Sun Mar 1 02:00:55 2026 -0800 Merge 1.6.1 changes back to patch.