Merge branch 'mm/reset-report'