Original commit: elastic/x-pack-elasticsearch@9dd554efff
Original commit: elastic/x-pack-elasticsearch@2bf095d3cb