Relates to elastic/x-pack-elasticsearch#26834 Original commit: elastic/x-pack-elasticsearch@57ba8f1d5f