Dev#17514 indexation refactoring

Ghislain Loas requested to merge dev#17514_indexation_refactoring into WIP

Merge request reports