Original commit: elastic/x-pack-elasticsearch@3fb4e1819c
Original commit: elastic/x-pack-elasticsearch@d0afe8a20d