Feature/cleanup after 2.9

Merged Christoph Grüninger requested to merge feature/cleanup-after-2.9 into master

Merge request reports