Various report fixes
Merge branch 'master' into as28_11668_report_issues

Merging master into as28_11668_report_issues
Re-generate assets