Fixed an issue where the reports and info report was doing a double call to the server for data.
Merge branch 'dev'