commit 2859867233150b433b8c20e94000ed4cc939acfe Merge: a766dbc9 a9b98608 Author: Michael Jumper <mjumper@apache.org> Date: Sat Dec 13 01:37:43 2025 -0800 Merge 1.6.1 changes back to patch.