commit 157080eacaa2ce0df4d7692e7ccefa2f9587071f Merge: e85cba26 0dfa375f Author: Michael Jumper <mjumper@apache.org> Date: Tue Mar 31 14:59:18 2026 -0700 Merge 1.6.1 changes back to patch.