ORION-447 Put initial discovery improvement back in