merge main into lucene_snapshot resolving conflicts#136096

iverase merged 1 commit intoelastic:lucene_snapshotelastic/elasticsearch:lucene_snapshotfrom

iverase:lucene_snapshot_conflitsiverase/elasticsearch:lucene_snapshot_conflitsCopy head branch name to clipboard