Original commit: elastic/x-pack-elasticsearch@65b2fee336
See elastic/elasticsearch#1022 Original commit: elastic/x-pack-elasticsearch@3ee8761312