Remove the optimisation at the end of a reindexation
Merge branch 'master' into search-1.3.x
Remove tests checking for optimisation
Merge branch 'master' into search-1.3.x
Fix unit tests (entirely)
Merge branch 'master' into search-1.3.x
Remove unused import
Merge branch 'master' into search-1.3.x
Merge branch 'search-1.3.x'