Merge 1.0.2 back into master

Merge request reports

Loading