Original commit: elastic/x-pack-elasticsearch@3d225c2562
Original commit: elastic/x-pack-elasticsearch@15caf307c4