Merge "Fix report generation"