Merge recent work back into master

Merge request reports

Loading