[9.3] Merge fixes from patch branch back into main (#139721)#139758

elasticsearchmachine merged 1 commit intoelastic:9.3elastic/elasticsearch:9.3from

jordan-powers:backport/9.3/pr-139721jordan-powers/elasticsearch:backport/9.3/pr-139721Copy head branch name to clipboard