Merging from origin and a few changes

Hi Mike Here is merge request with my work

Merge request reports

Loading