Mnt/tweaks

Merged Paul McCarthy requested to merge (removed):mnt/tweaks into master

Merge request reports