Original commit: elastic/x-pack-elasticsearch@2aeef5df3f
Original commit: elastic/x-pack-elasticsearch@cc7027c7ec