Cleanup/component indices

Merge request reports

Loading