Original commit: elastic/x-pack-elasticsearch@1f439bb5e9
Original commit: elastic/x-pack-elasticsearch@f084b626ce