Cleanup/rans

Merged Thomas Fetzer requested to merge cleanup/rans into master

Merge request reports