commit 3cba41e6ebc37ae0f5269025bf64f95bcaed2c98 Merge: d35ed8f7 8e16cf2c Author: Virtually Nick <vnick@apache.org> Date: Thu May 7 21:41:49 2026 -0400 Merge 1.6.1 changes to patch branch.