N.B. this upgrade would require HSEARCH-2128 as ES 2 will refuse to execute large queries without the right limits.