b3093611 Merge branch 'upstream-diy2' into tpl-diy2-3.6.0
6891accb diy2 2025-02-03 (e0d255f5)
1eb6d9a2 diy: update vendored version to e5f2edf6f

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !11882