Backport #1817 to 9.0 with conflict resolution#1830

Merged

karenzone merged 1 commit intoelastic:9.0from

karenzone:backport-1817-9.0

Apr 7, 2025

Commits on Apr 4, 2025

Conflict resolution to keep both path change and version updates

bmorelli25
authored and
karenzone
committed