Re-generate assets
Merge remote-tracking branch 'origin/staging' into report_refactoring