Original commit: elastic/x-pack-elasticsearch@57159e6bc6
Original commit: elastic/x-pack-elasticsearch@485ddb14f2