Original commit: elastic/x-pack-elasticsearch@f6a0d09575
Original commit: elastic/x-pack-elasticsearch@46c9bf780a