Tweaks

Merged Uriel Mayo requested to merge Tweaks into 15.0-stage

Merge request reports