Original commit: elastic/x-pack-elasticsearch@2aeef5df3f
Confirmed with @debadair, going ahead with merge Original commit: elastic/x-pack-elasticsearch@c510ddfe9e