Original commit: elastic/x-pack-elasticsearch@614e51bd31
Original commit: elastic/x-pack-elasticsearch@15caf307c4