Fix an error
Merge branch 'hotfix/report'
Fix error thrown from the report
Merge branch 'master' into develop