Finished Feat#0023

Merged Leander Wendt requested to merge Feat#0023 into master

Merge request reports