commit cf812f4052131eea11a0705af9c4a91d2f259832 Merge: 3384c6da df2501cb Author: Corentin SORIANO <csoriano@apache.org> Date: Thu Mar 26 11:27:52 2026 +0100 Merge changes from 1.6.1 branch back to patch.