Merge branch 'search_explain' into search_optimise
Merge branch 'search_optimise'