Es results matches 839214 merged

Should supersede #1065 assuming it passes CI.