Improve user feedback

Merged Erick Hitter requested to merge develop into master

Merge request reports