Manual merge index

Merged Carsten Rose requested to merge ManualMergeIndex into master

Merge request reports