Final touch changes

Merge latest changes into master

Merge request reports

Loading