Original commit: elastic/x-pack-elasticsearch@a2dd77ccf3
Original commit: elastic/x-pack-elasticsearch@62001c83cb