Draft: Resolve "Sort out component-index handling in devel"

Ali Mohammedrequested to merge
56-sort-out-component-index-handling-in-devel into devel

Closes #56

Merge request reports