3279

Alexander Diewaldrequested to merge
3279 into master

Intermediate merge to avoid excessive merge conflicts when performing more cleanup tasks.

Merge request reports