Cleanup/component indices

Merged Thomas Fetzer requested to merge cleanup/component-indices into master

Merge request reports