12.0 fix index

Merged Gastón Bertolani requested to merge 12.0-fix-index into 12.0

Merge request reports