Original commit: elastic/x-pack-elasticsearch@0d160df9b6
Original commit: elastic/x-pack-elasticsearch@791d9d6a45