Big merge from front end branch

Merge request reports

Loading