commit 0dfd36f4cb3e237523c261235b52a715f8247b4f Merge: 889ad1cd 2a4e793f Author: Michael Jumper <mjumper@apache.org> Date: Thu Jul 9 00:32:41 2026 -0700 Merge 1.6.1 changes back to patch.