commit d019f32f1c483d4284de3d1e8cd0d6b3f29309d3 Merge: 15f931a2 369a0e26 Author: Corentin SORIANO <csoriano@apache.org> Date: Fri Mar 27 09:24:32 2026 +0100 Merge changes from 1.6.1 branch back to patch.