Cleanup/privarswitch

Merged Timo Koch requested to merge cleanup/privarswitch into master

Merge request reports