Remove the optimisation at the end of a reindexation
Merge branch 'master' into search-1.3.x