Original commit: elastic/x-pack-elasticsearch@ccae9a84a9
Original commit: elastic/x-pack-elasticsearch@cc7027c7ec