Improve user feedback

Erick Hitter requested to merge develop into master

Merge request reports